Skip to content

Commit

Permalink
Merge pull request #4 from JiscSD/UKDSB-485-Fix-compatibility-issues-…
Browse files Browse the repository at this point in the history
…with-CKAN-Plugins

Ukdsb 485 fix compatibility issues with ckan plugins
  • Loading branch information
chris-daly authored Nov 7, 2024
2 parents 479ae06 + 269d5f6 commit bbb7510
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
# The CKAN version tag of the Solr and Postgres containers should match
# the one of the container the tests run on.
# You can switch this base image with a custom image tailored to your project
image: openknowledge/ckan-dev:2.9
image: ckan/ckan-dev:2.11
services:
solr:
image: ckan/ckan-solr-dev:2.9
image: ckan/ckan-solr:2.11-solr9
postgres:
image: ckan/ckan-postgres-dev:2.9
image: ckan/ckan-postgres-dev:2.10
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ __pycache__/
# Distribution / packaging
.Python
env/
venv/
build/
develop-eggs/
dist/
Expand Down Expand Up @@ -41,3 +42,6 @@ coverage.xml
# Sphinx documentation
docs/_build/
*.log

# JetBrains
*.idea
16 changes: 8 additions & 8 deletions ckanext/customised_fields_from_tag_vocabulary/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,30 @@ def authz_remove_role(self, object_role):
def delete(self, entity):
pass

def before_search(self, search_params):
def before_dataset_search(self, search_params):
return search_params

def after_search(self, search_results, search_params):
def after_dataset_search(self, search_results, search_params):
return search_results

def before_index(self, data_dict):
def before_dataset_index(self, data_dict):
data_dict.pop('wkt', None)
data_dict.pop('extras_wkt', None)
return data_dict

def before_view(self, pkg_dict):
def before_dataset_view(self, pkg_dict):
return pkg_dict

def after_create(self, context, data_dict):
def after_dataset_create(self, context, data_dict):
return data_dict

def after_update(self, context, data_dict):
def after_dataset_update(self, context, data_dict):
return data_dict

def after_delete(self, context, data_dict):
def after_dataset_delete(self, context, data_dict):
return data_dict

def after_show(self, context, data_dict):
def after_datset_show(self, context, data_dict):
return data_dict

# IConfigurer
Expand Down

0 comments on commit bbb7510

Please sign in to comment.