From 9e87f2271d8ed746b642cb283edd10413ef597d9 Mon Sep 17 00:00:00 2001 From: blagoja Date: Mon, 15 Jul 2024 14:17:31 +0200 Subject: [PATCH] Auth functions and add busoperator dataset button --- ckanext/bulkupload/auth.py | 4 ++++ ckanext/bulkupload/plugin.py | 1 + ckanext/bulkupload/templates/snippets/add_dataset.html | 9 +++++++++ ckanext/bulkupload/views.py | 8 ++++---- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 ckanext/bulkupload/templates/snippets/add_dataset.html diff --git a/ckanext/bulkupload/auth.py b/ckanext/bulkupload/auth.py index da33712..66aac40 100644 --- a/ckanext/bulkupload/auth.py +++ b/ckanext/bulkupload/auth.py @@ -1,2 +1,6 @@ def bulk_resource_upload(context, data_dict): return {'success': False} + + +def package_busoperator(context, data_dict): + return {'success': False} diff --git a/ckanext/bulkupload/plugin.py b/ckanext/bulkupload/plugin.py index 6348426..ab38d90 100644 --- a/ckanext/bulkupload/plugin.py +++ b/ckanext/bulkupload/plugin.py @@ -23,6 +23,7 @@ def update_config(self, config_): def get_auth_functions(self): return { "bulk_resource_upload": auth.bulk_resource_upload, + "package_busoperator": auth.package_busoperator, } # IBlueprint diff --git a/ckanext/bulkupload/templates/snippets/add_dataset.html b/ckanext/bulkupload/templates/snippets/add_dataset.html new file mode 100644 index 0000000..caa2aa0 --- /dev/null +++ b/ckanext/bulkupload/templates/snippets/add_dataset.html @@ -0,0 +1,9 @@ +{% set dataset_type = dataset_type if dataset_type else 'dataset' %} + +{% if group %} + {% link_for _('Add Dataset'), named_route='dataset.new', group=group, class_='btn btn-primary', icon='plus-square' %} + {% link_for _('Add Dataset Busoperator'), group=group, named_route='bulkupload.package_busoperator', class_='btn btn-primary', icon='plus-square' %} +{% else %} + {% link_for _('Add ' + dataset_type.title()), named_route='%s.new' % dataset_type, class_='btn btn-primary', icon='plus-square' %} + {% link_for _('Add Dataset Busoperator'), named_route='bulkupload.package_busoperator', class_='btn btn-primary', icon='plus-square' %} +{% endif %} \ No newline at end of file diff --git a/ckanext/bulkupload/views.py b/ckanext/bulkupload/views.py index 7eeec24..cabcdb1 100644 --- a/ckanext/bulkupload/views.py +++ b/ckanext/bulkupload/views.py @@ -29,7 +29,7 @@ for your uploads''') -def busoperator(): +def package_busoperator(): if flask.request.method == 'GET': context = { @@ -47,7 +47,7 @@ def busoperator(): org_list = tk.get_action("organization_list_for_user")(context, user_dict) try: - tk.check_access("bulk_resource_upload", context) + tk.check_access("package_busoperator", context) except: return tk.abort(403) @@ -65,7 +65,7 @@ def busoperator(): "auth_user_obj": g.userobj, } try: - tk.check_access("bulk_resource_upload", context) + tk.check_access("package_busoperator", context) except: return tk.abort(403) @@ -169,7 +169,7 @@ def bulk_resource_upload(pkg_name): bulkupload.add_url_rule("/dataset/new/busoperator", - view_func=busoperator, + view_func=package_busoperator, methods=("GET", "POST")) bulkupload.add_url_rule("/dataset//resource/new/bulkupload",