diff --git a/ckanext/csvwmapandtransform/action.py b/ckanext/csvwmapandtransform/action.py index b227b0b..64b72ce 100644 --- a/ckanext/csvwmapandtransform/action.py +++ b/ckanext/csvwmapandtransform/action.py @@ -35,14 +35,23 @@ def __init__(self, **kwargs): def csvwmapandtransform_find_mappings(context: Context, data_dict): - groups = [entry.name for entry in toolkit.get_action("group_list")({}, {"all_fields": True})] - if MAPPING_GROUP in groups: + mapping_group_id = next( + ( + entry["id"] if entry["title"] == MAPPING_GROUP else None + for entry in toolkit.get_action("group_list")({}, {"all_fields": True}) + ), + None, + ) + # log.info(f"groups=={groups}") + if mapping_group_id: mapping_group = toolkit.get_action("group_show")( - {}, {"id": MAPPING_GROUP, "include_datasets": True} + {"ignore_auth": True}, {"id": mapping_group_id, "include_datasets": True} ) else: mapping_group = create_group(MAPPING_GROUP) packages = mapping_group.get("packages", None) + log.info(f"mappings=={packages}") + if packages: packages = [ toolkit.get_action("package_show")({}, {"id": package["id"]}) diff --git a/ckanext/csvwmapandtransform/assets/script.js b/ckanext/csvwmapandtransform/assets/script.js deleted file mode 100644 index 2c8ce84..0000000 --- a/ckanext/csvwmapandtransform/assets/script.js +++ /dev/null @@ -1,10 +0,0 @@ -ckan.module("csvwmapandtransform-module", function ($, _) { - "use strict"; - return { - options: { - debug: false, - }, - - initialize: function () {}, - }; -}); diff --git a/ckanext/csvwmapandtransform/assets/style.css b/ckanext/csvwmapandtransform/assets/style.css deleted file mode 100644 index 59dba73..0000000 --- a/ckanext/csvwmapandtransform/assets/style.css +++ /dev/null @@ -1,5 +0,0 @@ -/* -body { - border-radius: 0; -} -*/ \ No newline at end of file diff --git a/ckanext/csvwmapandtransform/assets/webassets.yml b/ckanext/csvwmapandtransform/assets/webassets.yml deleted file mode 100644 index b0fc8f8..0000000 --- a/ckanext/csvwmapandtransform/assets/webassets.yml +++ /dev/null @@ -1,14 +0,0 @@ -# csvwmapandtransform-js: -# filter: rjsmin -# output: ckanext-csvwmapandtransform/%(version)s-csvwmapandtransform.js -# contents: -# - js/csvwmapandtransform.js -# extra: -# preload: -# - base/main - -# csvwmapandtransform-css: -# filter: cssrewrite -# output: ckanext-csvwmapandtransform/%(version)s-csvwmapandtransform.css -# contents: -# - css/csvwmapandtransform.css diff --git a/ckanext/csvwmapandtransform/plugin.py b/ckanext/csvwmapandtransform/plugin.py index d4939fa..6f8d33d 100644 --- a/ckanext/csvwmapandtransform/plugin.py +++ b/ckanext/csvwmapandtransform/plugin.py @@ -67,7 +67,7 @@ def notify(self, resource: model.Resource): # IResourceController - if not toolkit.check_ckan_version("2.10"): + if not toolkit.check_ckan_version("2.10") or toolkit.check_ckan_version("2.11"): def after_create(self, context, resource_dict): self.after_resource_create(context, resource_dict)