Skip to content
Snippets Groups Projects
Commit 70d7cefe authored by Thorge Petersen's avatar Thorge Petersen
Browse files

Removed legacy route interferring with resource crud routes

parent 8e6ef16b
Branches
Tags
2 merge requests!41Version 2.0.0,!38Merge py3 into dev
...@@ -20,12 +20,12 @@ import ckanext.odsh.validation as validation ...@@ -20,12 +20,12 @@ import ckanext.odsh.validation as validation
import ckanext.odsh.search as search import ckanext.odsh.search as search
import ckanext.odsh.tools as tools import ckanext.odsh.tools as tools
from ckanext.odsh.views import default from ckanext.odsh.views import default
from ckanext.odsh.views import package # from ckanext.odsh.views import package
from ckanext.odsh.views import user from ckanext.odsh.views import user
from ckanext.odsh.views import dashboard from ckanext.odsh.views import dashboard
from ckanext.odsh.views import harvest from ckanext.odsh.views import harvest
from ckanext.odsh.views import feed from ckanext.odsh.views import feed
from ckanext.dcat import blueprints as dcat_view # from ckanext.dcat import blueprints as dcat_view
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -63,11 +63,11 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm ...@@ -63,11 +63,11 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
# bp_default.add_url_rule('/catalog.<any("xml", "rdf", "n3", "ttl", "jsonld"):_format>', view_func=dcat_view.read_catalog, defaults={'_format': 'xml'}, methods=['GET']) # bp_default.add_url_rule('/catalog.<any("xml", "rdf", "n3", "ttl", "jsonld"):_format>', view_func=dcat_view.read_catalog, defaults={'_format': 'xml'}, methods=['GET'])
# Package # Package
bp_package = package.blueprint # bp_package = package.blueprint
rules = [ # rules = [
('/dataset/<id>/resource/<resource_id>', 'redirect_dataset_resource', package.redirect_dataset_resource), ] # ('/dataset/<id>/resource/<resource_id>', 'redirect_dataset_resource', package.redirect_dataset_resource), ]
for rule in rules: # for rule in rules:
bp_package.add_url_rule(*rule) # bp_package.add_url_rule(*rule)
# User # User
bp_user = user.blueprint bp_user = user.blueprint
...@@ -99,7 +99,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm ...@@ -99,7 +99,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
bp_feed = feed.blueprint bp_feed = feed.blueprint
bp_feed.add_url_rule(u'/feeds/custom.atom', methods=[u'GET'], view_func=feed.custom) bp_feed.add_url_rule(u'/feeds/custom.atom', methods=[u'GET'], view_func=feed.custom)
return [bp_default, bp_package, bp_user, bp_dashboard, bp_harvest, bp_feed] return [bp_default, bp_user, bp_dashboard, bp_harvest, bp_feed] #bp_package
# IActions # IActions
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment