wagtail-cjkcms 24.12.4__tar.gz → 25.1.1__tar.gz

{wagtail_cjkcms-24.12.4 → wagtail_cjkcms-25.1.1}/CHANGELOG.md

@@ -14,6 +14,11 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [25.1.1] - 2025-01-01
+### Fixed
+ - Fixed regression bug causing menu items to be hidden. This required me to fully remove
+ check for the deprecated menu items visibility options.
+
 ## [24.12.4] - 2024-12-31
 ### Removed
  - Removed deprecated menu visibility management via visible_for field in NavBlocks

{wagtail_cjkcms-24.12.4/wagtail_cjkcms.egg-info → wagtail_cjkcms-25.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.12.4
+Version: 25.1.1
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x/6.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause

{wagtail_cjkcms-24.12.4 → wagtail_cjkcms-25.1.1}/cjkcms/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (24, 12, 4, "")
+VERSION = (25, 1, 1, "")
 
 __version_info__ = VERSION
 __version__ = ".".join(map(str, VERSION[:3])) + (f"-{VERSION[3]}" if VERSION[3] else "")

{wagtail_cjkcms-24.12.4 → wagtail_cjkcms-25.1.1}/cjkcms/blocks/content_blocks.py

@@ -182,17 +182,6 @@ class NavBaseLinkBlock(BaseBlock):
         label=_("Image"),
     )
 
-    if cms_settings.CJKCMS_NAVBAR_SHOW_VISIBLE_FOR:
-        visible_for = blocks.ChoiceBlock(
-            choices=cms_settings.CJKCMS_AUTH_VISIBILITY_CHOICES,
-            default=cms_settings.CJKCMS_AUTH_VISIBILITY_DEFAULT,
-            required=False,
-            label=_("Item visibility"),
-            help_text=_(
-                "DEPRECATED. Use the visibility options in the `Advanced Settings`. "
-            ),
-        )
-
 
 class NavExternalLinkBlock(NavBaseLinkBlock):
     """

{wagtail_cjkcms-24.12.4 → wagtail_cjkcms-25.1.1}/cjkcms/settings.py

@@ -485,10 +485,6 @@ class _DefaultSettings:
     CJKCMS_VERSION_MONITOR_TOKEN = ""  # blank token = disabled version monitor api
     CJKCMS_VERSION_MONITOR_ALLOWED_DOMAINS = []  # disallow from any domain by default
 
-    CJKCMS_NAVBAR_SHOW_VISIBLE_FOR = (
-        False  # safety fallback for a deprecated and removed feature
-    )
-
     def __getattribute__(self, attr: str):
         # First load from Django settings.
         # If it does not exist, load from _DefaultSettings.

wagtail_cjkcms-25.1.1/cjkcms/templates/cjkcms/blocks/base_link_block.html

@@ -0,0 +1,56 @@
+{% load cjkcms_tags wagtailcore_tags wagtailimages_tags %}
+
+{% block menu_item %}
+    {% if value.page.live or value.link or value.document %}
+    {% is_menu_item_dropdown value as has_dropdown %}
+    <li class="{{liclass}} {% if has_dropdown %}dropdown{% endif %}">
+        {% is_active_page page value.page as is_active_url %}
+        <a href="{% block url %}#{% endblock %}"
+        {% if value.settings.custom_id %}id="{{value.settings.custom_id}}"{% endif %}
+        class="{{aclass}} {% if has_dropdown %}dropdown-toggle{% endif %}
+                {% if is_active_url %}active{% endif %}
+                {{value.settings.custom_css_class}}"
+        {% if has_dropdown %}data-bs-toggle="dropdown"
+        data-mdb-dropdown-init
+        data-mdb-ripple-init
+        role="button"
+        aria-haspopup="true"
+        aria-expanded="false"
+        {% endif %}
+        {% if ga_event_label %}
+        data-ga-event-label="{{ ga_event_label }}"
+        {% endif %}
+        {% if ga_event_category %}
+        data-ga-event-category="{{ ga_event_category }}"
+        {% endif %}
+        >
+            {% if value.image %}
+                {% image value.image max-200x200 as img %}
+                <img src="{{img.url}}" class="w-100" alt="{{img.image.title}}"/>
+            {% elif value.display_text %}
+                {% link_display value.display_text as dt %}
+                {{dt|safe}}
+            {% elif value.page %}
+                {{value.page.title}}
+            {% elif value.document %}
+                {{value.document.title}}
+            {% endif %}
+        </a>
+
+
+        {% if has_dropdown %}
+        <ul class="dropdown-menu">
+            {% for sub_link in value.sub_links %}
+                {% include_block sub_link with liclass="" aclass="dropdown-item" %}
+            {% endfor %}
+            {% if value.show_child_links %}
+                {% for child in value.page.specific.get_index_children %}
+                    {% is_active_page page child as is_active_child %}
+                    <li><a class="dropdown-item {% if is_active_child %}active{% endif %}" href="{% pageurl child %}">{{child.title}}</a></li>
+                {% endfor %}
+            {% endif %}
+        </ul>
+        {% endif %} {# has_dropdown #}
+    </li>
+    {% endif %} {# value.page.live or value.link or value.document #}
+{% endblock %}

{wagtail_cjkcms-24.12.4 → wagtail_cjkcms-25.1.1/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.12.4
+Version: 25.1.1
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x/6.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause

{wagtail_cjkcms-24.12.4 → wagtail_cjkcms-25.1.1}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -347,10 +347,12 @@ cjkcms/tests/test_webpage.py
 cjkcms/tests/urls.py
 cjkcms/tests/media/images/test.original.png
 cjkcms/tests/media/images/test_6mZL9NZ.original.png
+cjkcms/tests/media/images/test_OSPIkp8.original.png
 cjkcms/tests/media/images/test_YBCJmYS.original.png
 cjkcms/tests/media/images/test_q0QJ4UA.original.png
 cjkcms/tests/media/original_images/test.png
 cjkcms/tests/media/original_images/test_6mZL9NZ.png
+cjkcms/tests/media/original_images/test_OSPIkp8.png
 cjkcms/tests/media/original_images/test_YBCJmYS.png
 cjkcms/tests/media/original_images/test_q0QJ4UA.png
 cjkcms/tests/testapp/__init__.py

wagtail_cjkcms-24.12.4/cjkcms/templates/cjkcms/blocks/base_link_block.html

@@ -1,61 +0,0 @@
-{% load cjkcms_tags wagtailcore_tags wagtailimages_tags %}
-
-{% block menu_item %}
-    {% can_show_item value.visible_for as csi %}
-    {% if csi %}
-        {% if value.page.live or value.link or value.document %}
-        {% is_menu_item_dropdown value as has_dropdown %}
-        <li class="{{liclass}} {% if has_dropdown %}dropdown{% endif %}">
-            {% is_active_page page value.page as is_active_url %}
-            <a href="{% block url %}#{% endblock %}"
-            {% if value.settings.custom_id %}id="{{value.settings.custom_id}}"{% endif %}
-            class="{{aclass}} {% if has_dropdown %}dropdown-toggle{% endif %}
-                    {% if is_active_url %}active{% endif %}
-                    {{value.settings.custom_css_class}}"
-            {% if has_dropdown %}data-bs-toggle="dropdown"
-            data-mdb-dropdown-init
-            data-mdb-ripple-init
-            role="button"
-            aria-haspopup="true"
-            aria-expanded="false"
-            {% endif %}
-            {% if ga_event_label %}
-            data-ga-event-label="{{ ga_event_label }}"
-            {% endif %}
-            {% if ga_event_category %}
-            data-ga-event-category="{{ ga_event_category }}"
-            {% endif %}
-            >
-                {% if value.image %}
-                    {% image value.image max-200x200 as img %}
-                    <img src="{{img.url}}" class="w-100" alt="{{img.image.title}}"/>
-                {% elif value.display_text %}
-                    {% link_display value.display_text as dt %}
-                    {{dt|safe}}
-                {% elif value.page %}
-                    {{value.page.title}}
-                {% elif value.document %}
-                    {{value.document.title}}
-                {% endif %}
-            </a>
-
-
-            {% if has_dropdown %}
-            <ul class="dropdown-menu">
-                {% for sub_link in value.sub_links %}
-                    {% include_block sub_link with liclass="" aclass="dropdown-item" %}
-                {% endfor %}
-                {% if value.show_child_links %}
-                    {% for child in value.page.specific.get_index_children %}
-                        {% is_active_page page child as is_active_child %}
-                        <li><a class="dropdown-item {% if is_active_child %}active{% endif %}" href="{% pageurl child %}">{{child.title}}</a></li>
-                    {% endfor %}
-                {% endif %}
-            </ul>
-            {% endif %} {# has_dropdown #}
-        </li>
-        {% endif %} {# value.page.live or value.link or value.document #}
-    {% else %} {# csi #}
-        {# NO SHOW #}
-    {% endif %} {# csi #}
-{% endblock %}