Merge sixodp_routes to sixodp

ansible/vars/environment-specific/build.yml

@@ -89,7 +89,6 @@ wordpress_users:
     email: admin@localhost.localdomain
 
 ckan_extensions:
-  - ckanext-sixodp_routes
   - ckanext-sixodp_scheming
   - ckanext-sixodp
   - ckanext-sixodp_showcase
@@ -136,7 +135,6 @@ enabled_ckan_extensions:
     #- report
     - publisher_activity_report
     #- rating
-    - sixodp_routes
     - qa
     - archiver
     - hierarchy_display

ansible/vars/environment-specific/generic-qa.yml

@@ -101,7 +101,6 @@ ckan_admins:
   - "{{ ckan_users.harvest.username }}"
 
 ckan_extensions:
-  - ckanext-sixodp_routes
   - ckanext-sixodp_scheming
   - ckanext-sixodp
   - ckanext-sixodp_showcase
@@ -153,7 +152,6 @@ enabled_ckan_extensions:
     - report
     - publisher_activity_report
     #- rating
-    - sixodp_routes
     - hierarchy_display
     - hierarchy_form
     - reminder

ansible/vars/environment-specific/vagrant.yml

@@ -87,7 +87,6 @@ ckan_admins:
   - "{{ ckan_users.harvest.username }}"
 
 ckan_extensions:
-  - ckanext-sixodp_routes
   - ckanext-sixodp_scheming
   - ckanext-sixodp
   - ckanext-sixodp_showcase
@@ -139,7 +138,6 @@ enabled_ckan_extensions:
     #- report
     - publisher_activity_report
     #- rating
-    - sixodp_routes
     - hierarchy_display
     - hierarchy_form
     - reminder

ckanext/ckanext-sixodp/ckanext/sixodp/plugin.py

@@ -13,8 +13,10 @@
 from ckanext.sixodp.logic import action
 from ckan.lib.plugins import DefaultTranslation
 
+from .views import sixodp
+
 get_action = logic.get_action
-config= toolkit.config
+config = toolkit.config
 
 unicode_safe = toolkit.get_validator('unicode_safe')
 
@@ -168,6 +170,9 @@ def get_qa_openness(dataset):
                   extra_vars=extra_vars))
 
 
+def admin_only(context, data_dict=None):
+    return {'success': False, 'msg': 'Access restricted to system administrators'}
+
 class SixodpPlugin(plugins.SingletonPlugin, DefaultTranslation):
     plugins.implements(plugins.IConfigurer)
     plugins.implements(plugins.IConfigurable)
@@ -177,6 +182,8 @@ class SixodpPlugin(plugins.SingletonPlugin, DefaultTranslation):
         plugins.implements(plugins.ITranslation, inherit=True)
     plugins.implements(plugins.IPackageController, inherit=True)
     plugins.implements(plugins.IActions, inherit=True)
+    plugins.implements(plugins.IAuthFunctions)
+    plugins.implements(plugins.IBlueprint)
 
     # IConfigurer
 
@@ -308,4 +315,27 @@ def after_search(self, search_results, search_params):
     def get_actions(self):
         return {
             'package_autocomplete': action.package_autocomplete,
-        }
+        }
+
+    # IAuthFunctions
+
+    def get_auth_functions(self):
+        return {'user_list': admin_only,
+                'revision_list': admin_only,
+                'revision_diff': admin_only,
+                'package_revision_list': admin_only
+                }
+
+    # IBlueprint
+    def get_blueprints(self):
+        return [sixodp]
+
+
+#TODO: add sorting
+# if q and not sort_by:
+#                 sort_by = 'score desc, metadata_modified desc'
+#             elif not sort_by:
+#                 sort_by = 'metadata_created desc'
+@toolkit.chained_action
+def package_search(original_action, context, data_dict):
+    return original_action(context, data_dict)