Merge pull request #4458 from opendatazurich/4457-legacy-routes

[#4457] Missing legacy routes
ckan · Sep 14, 2018 · 7b51935 · 7b51935
2 parents 16cda2d + 8449883
commit 7b51935
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -69,8 +69,17 @@
     'home': 'home.index',
     'about': 'home.about',
     'search': 'dataset.search',
+    'dataset_read': 'dataset.read',
+    'dataset_activity': 'dataset.activity',
+    'dataset_groups': 'dataset.groups',
     'group_index': 'group.index',
-    'organizations_index': 'organization.index'
+    'group_about': 'group.about',
+    'group_read': 'group.read',
+    'group_activity': 'group.activity',
+    'organizations_index': 'organization.index',
+    'organization_activity': 'organization.activity',
+    'organization_read': 'organization.read',
+    'organization_about': 'organization.about',
 }
 
 

diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py
@@ -563,6 +563,51 @@ def test_legacy_pylon_routes(self):
             '<li><a href="/group/">Groups</a></li>'
             '<li><a href="/about">About</a></li>'))
 
+    def test_dataset_navigation_legacy_routes(self):
+        dataset_name = 'test-dataset'
+        eq_(
+            h.build_nav_icon('dataset_read', 'Datasets', id=dataset_name),
+            '<li><a href="/dataset/test-dataset">Datasets</a></li>'
+        )
+        eq_(
+            h.build_nav_icon('dataset_groups', 'Groups', id=dataset_name),
+            '<li><a href="/dataset/groups/test-dataset">Groups</a></li>'
+        )
+        eq_(
+            h.build_nav_icon('dataset_activity', 'Activity Stream', id=dataset_name),
+            '<li><a href="/dataset/activity/test-dataset">Activity Stream</a></li>'
+        )
+
+    def test_group_navigation_legacy_routes(self):
+        group_name = 'test-group'
+        eq_(
+            h.build_nav_icon('group_read', 'Datasets', id=group_name),
+            '<li><a href="/group/test-group">Datasets</a></li>'
+        )
+        eq_(
+            h.build_nav_icon('group_activity', 'Activity Stream', id=group_name),
+            '<li><a href="/group/activity/test-group">Activity Stream</a></li>'
+        )
+        eq_(
+            h.build_nav_icon('group_about', 'About', id=group_name),
+            '<li><a href="/group/about/test-group">About</a></li>'
+        )
+
+    def test_organization_navigation_legacy_routes(self):
+        org_name = 'test-org'
+        eq_(
+            h.build_nav_icon('organization_read', 'Datasets', id=org_name),
+            '<li><a href="/organization/test-org">Datasets</a></li>'
+        )
+        eq_(
+            h.build_nav_icon('organization_activity', 'Activity Stream', id=org_name),
+            '<li><a href="/organization/activity/test-org">Activity Stream</a></li>'
+        )
+        eq_(
+            h.build_nav_icon('organization_about', 'About', id=org_name),
+            '<li><a href="/organization/about/test-org">About</a></li>'
+        )
+
 
 class TestHelperException(helpers.FunctionalTestBase):