Merge branch 'test' of gitlab.pirati.cz:/to/majak into feat/redesign-fixes-4

shared/models/main.py

@@ -255,11 +255,22 @@ class PageInMenuMixin(Page):
         for menu in menu_iterator:
             if menu.block_type == "menu_item":
                 if (
+<<<<<<< HEAD
                     instance.full_url is not None
                     and len(instance.full_url) != 0
                     and menu.value["link"] is not None
                     and len(menu.value["link"]) != 0
                 ) and menu.value["link"].strip() == instance.full_url.strip():
+=======
+                    menu.value["link"].strip()
+                    if menu.value["link"] is not None
+                    else ""
+                ) == (
+                    instance.full_url.strip()
+                    if instance.full_url
+                    else ""
+                ):
+>>>>>>> 8671dd739c03d668ed1b01173e5ce36ead1a6a3b
                     return menu.value["title"]
 
                 if menu.value["page"] is None:
@@ -270,12 +281,24 @@ class PageInMenuMixin(Page):
             elif menu.block_type == "menu_parent":
                 for item in menu.value["menu_items"]:
                     if (
+<<<<<<< HEAD
                         instance.full_url is not None
                         and len(instance.full_url) != 0
                         and item.value["link"] is not None
                         and len(menu.value["link"]) != 0
                     ) and item.value["link"].strip() == instance.full_url.strip():
                         return item.value["title"]
+=======
+                        item["link"].strip()
+                        if item["link"] is not None
+                        else ""
+                    ) == (
+                        instance.full_url.strip()
+                        if instance.full_url
+                        else ""
+                    ):
+                        return menu.value["title"]
+>>>>>>> 8671dd739c03d668ed1b01173e5ce36ead1a6a3b
 
                     if item["page"] is None:
                         continue

uniweb/templates/uniweb/blocks/people_group_block.html

@@ -5,7 +5,11 @@
   <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
     {% for person_details in self.person_list %}
         {% with person_details.person as person_page %}
-            {% include "shared/person_badge_snippet.html" with title=person_details.position|default:person_page.job %}
+          {% if person_details.position %}
+            {% include "shared/person_badge_snippet.html" with title=person_details.position %}
+          {% else %}
+            {% include "shared/person_badge_snippet.html" with title=person_page.job %}
+          {% endif %}
         {% endwith %}
     {% endfor %}
   </div>