Merge pull request #146 from vrk-kpa/REKDAT-81_pages-only-footer

REKDAT-81: Only show ckanext-pages links in footer
vrk-kpa · Dec 7, 2023 · 647ead2 · 647ead2
2 parents 43bb557 + d90cd39
commit 647ead2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ckan/ckanext/ckanext-registrydata/ckanext/registrydata/helpers.py b/ckan/ckanext/ckanext-registrydata/ckanext/registrydata/helpers.py
@@ -10,6 +10,9 @@
 import iso8601
 import requests
 
+from ckan.lib.helpers import build_nav_main as ckan_build_nav_main
+from ckanext.pages.plugin import build_pages_nav_main as pages_build_nav_main
+
 
 log = getLogger(__name__)
 _ = toolkit._
@@ -188,3 +191,10 @@ def scheming_category_list(args):
 
 def check_group_selected(val, data):
     return any(x['name'] == val for x in data)
+
+
+def build_nav_main(*args, pages=False):
+    if pages:
+        return pages_build_nav_main(*args)
+    else:
+        return ckan_build_nav_main(*args)
diff --git a/ckan/ckanext/ckanext-registrydata/ckanext/registrydata/plugin.py b/ckan/ckanext/ckanext-registrydata/ckanext/registrydata/plugin.py
@@ -49,7 +49,8 @@ def get_helpers(self):
             'get_homepage_news': helpers.get_homepage_news,
             'get_homepage_groups': helpers.get_homepage_groups,
             'scheming_category_list': helpers.scheming_category_list,
-            'check_group_selected': helpers.check_group_selected
+            'check_group_selected': helpers.check_group_selected,
+            'build_nav_main': helpers.build_nav_main
         }
 
     # IValidators:

diff --git a/ckan/ckanext/ckanext-registrydata/ckanext/registrydata/templates/footer.html b/ckan/ckanext/ckanext-registrydata/ckanext/registrydata/templates/footer.html
@@ -7,7 +7,7 @@
       </div>
       <div class="footer-links">
         <ul class="nav navbar footer-nav">
-          {{ h.build_nav_main() }}
+          {{ h.build_nav_main(pages=True) }}
         </ul>
       </div>
     </div>