CKAN-Extensions
/
ckanext-privatedatasets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore IRoutes for CKAN 2.7

This commit is contained in:
Álvaro Arranz 2018-07-15 00:42:58 +02:00
parent 730f5c7b6e
commit 9d86939989
No known key found for this signature in database
GPG Key ID: A9BA9AAE8CF561AB
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ckanext/privatedatasets/plugin.py
View File

@ -38,6 +38,7 @@ class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm, DefaultPermissio
p.implements(p.IAuthFunctions)
p.implements(p.IConfigurer)
p.implements(p.IBlueprint)
p.implements(p.IRoutes, inherit=True)
p.implements(p.IActions)
p.implements(p.IPackageController, inherit=True)
p.implements(p.ITemplateHelpers)
@ -142,9 +143,18 @@ class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm, DefaultPermissio
############################# IBLUEPRINT #############################
######################################################################
# Deprecated but Required for CKAN 2.7
def before_map(self, m):
if p.toolkit.check_ckan_version(max_version='2.7.99'):
m.connect('user_acquired_datasets', '/dashboard/acquired', ckan_icon='shopping-cart',
controller='ckanext.privatedatasets.views:AcquiredDatasetsControllerUI',
action='acquired_datasets', conditions=dict(method=['GET']))
return m
def get_blueprint(self):
blueprint = Blueprint('privatedatasets', self.__module__)
blueprint.add_url_rule('/dashboard/acquired', 'acquired_datasets', acquired_datasets)
if p.toolkit.check_ckan_version(min_version='2.8'):
blueprint.add_url_rule('/dashboard/acquired', 'acquired_datasets', acquired_datasets)
return blueprint
######################################################################

2
ckanext/privatedatasets/templates/user/dashboard.html
View File

@ -18,7 +18,7 @@
<ul class="nav nav-tabs">
{{ h.build_nav_icon('user_dashboard', _('News feed')) }}
{{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }}
{{ h.build_nav_icon('privatedatasets.acquired_datasets', _('Acquired Datasets')) }}
{{ h.build_nav_icon('user_acquired_datasets', _('Acquired Datasets')) }}
{{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }}
{{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }}
</ul>

10
ckanext/privatedatasets/views.py
View File

@ -19,7 +19,7 @@
from __future__ import absolute_import, unicode_literals
from ckan import logic
from ckan import logic, model
from ckan.common import _, g
from ckan.lib import base
from ckan.plugins import toolkit
@ -28,7 +28,7 @@ from ckanext.privatedatasets import constants
def acquired_datasets():
context = {'for_view': True, 'user': g.user, 'auth_user_obj': g.userobj}
context = {'auth_user_obj': g.userobj, 'for_view': True, 'model': model, 'session': model.Session, 'user': g.user}
data_dict = {'user_obj': g.userobj}
try:
user_dict = logic.get_action('user_show')(context, data_dict)
@ -43,3 +43,9 @@ def acquired_datasets():
'acquired_datasets': acquired_datasets,
}
return base.render('user/dashboard_acquired.html', extra_vars)
class AcquiredDatasetsControllerUI(base.BaseController):
def acquired_datasets(self):
return acquired_datasets()