From 58c83e2eea8571a7a77bd5cafa9b2f2a300d3cca Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Sat, 6 Jan 2024 13:21:05 +0300
Subject: [PATCH] 0.4.45 page title

---
 BaseModels/base_models.py               | 14 +++++++++++++
 templates/head_includes/meta_names.html | 26 ++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/BaseModels/base_models.py b/BaseModels/base_models.py
index 2f69bfd..a727514 100644
--- a/BaseModels/base_models.py
+++ b/BaseModels/base_models.py
@@ -148,6 +148,20 @@ class BaseModelViewPage(BaseModel):
     class Meta:
         abstract = True
 
+    def get_title(self):
+        if self.seo_title:
+            return self.seo_title
+        elif self.title:
+            return self.title
+        else:
+            return self.name
+
+    def get_description(self):
+        if self.seo_description:
+            return self.seo_description
+        else:
+            return self.description
+
     def get_feedback_block(self):
         blocks = self.get_blocks()
         for block in blocks:
diff --git a/templates/head_includes/meta_names.html b/templates/head_includes/meta_names.html
index 7184830..1084f2c 100644
--- a/templates/head_includes/meta_names.html
+++ b/templates/head_includes/meta_names.html
@@ -1,19 +1,19 @@
-{% if page.seo_title %}
-    <title>{{ page.seo_title }}</title>
-{% elif page.title %}
-    <title>{{ page.title }}</title>
-{% elif page.name %}
-    <title>{{ page.name }}</title>
-{% endif %}
+{#{% if page.seo_title %}#}
+<title>{{ page.get_title }}</title>
+{#{% elif page.title %}#}
+{#    <title>{{ page.title }}</title>#}
+{#{% elif page.name %}#}
+{#    <title>{{ page.name }}</title>#}
+{#{% endif %}#}
 
-{% if page.seo_description %}
-    <meta name="description" content="{{ page.seo_description }}"/>
-{% elif page.description %}
-    <meta name="description" content="{{ page.description }}"/>
+{% if page.get_description %}
+    <meta name="description" content="{{ page.get_description }}"/>
+{#{% elif page.description %}#}
+{#    <meta name="description" content="{{ page.description }}"/>#}
 {% endif %}
 
 {% if page.seo_keywords %}
     <meta name="keywords" content="{{ page.seo_keywords }}"/>
-{% elif page.description %}
-    <meta name="keywords" content="{{ page.description }}"/>
+{% elif page.get_description %}
+    <meta name="keywords" content="{{ page.get_description }}"/>
 {% endif %}
\ No newline at end of file