From: Alex Sadleir Date: Mon, 16 Sep 2013 09:23:09 +0000 Subject: Show edited and created datasets on user profile/dashboard X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=c84d10ac6b729de3e838eeb734995bd49de8d4b8 --- Show edited and created datasets on user profile/dashboard --- --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,27 +5,26 @@ - - - + - - + + - - + + + - @@ -180,7 +188,6 @@ - @@ -332,6 +339,7 @@ + @@ -339,10 +347,10 @@ - + + - @@ -353,7 +361,20 @@ + + + + + + + - - @@ -494,23 +507,24 @@ - - + + - + - + + @@ -558,7 +572,7 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + --- a/ckanext/datagovau/plugin.py +++ b/ckanext/datagovau/plugin.py @@ -1,21 +1,29 @@ import logging import ckan.plugins as plugins +import ckan.lib as lib +import ckan.lib.dictization.model_dictize as model_dictize import ckan.plugins.toolkit as tk +import ckan.model as model +#parse the activity feed for last active non-system user +def get_last_active_user(id): + system_user = "de0ba262-83fe-45e2-adda-41bb9f0c86d8" + user_list = [x for x in lib.helpers.get_action('package_activity_list',{'id':id}) if x['user_id'] != system_user] + user = user_list[0]['user_id'] + if user is None: + return lib.helpers.get_action('user_show',{'id':system_user}) + else: + return lib.helpers.get_action('user_show',{'id':user}) -# get_action will be deprecated soon, this is the replacement -def get_user(user): - user_name = unicode(user) - if user_name: - user_obj = model.User.get(id) - context['user_obj'] = user_obj - if user_obj is None: - raise NotFound - else: - raise NotFound - - return model_dictize.user_dictize(user_obj,context) +# get user created datasets and those they have edited +def get_user_datasets(user_dict): + created_datasets_list = user_dict['datasets'] + active_datasets_id_list = [x['data']['package'] for x in + lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')] + active_datasets_list = active_datasets_id_list #if you need more detail, fetch each dataset here + print active_datasets_list + return created_datasets_list + active_datasets_list class ExampleIDatasetFormPlugin(plugins.SingletonPlugin, @@ -53,7 +61,7 @@ # config['licenses_group_url'] = 'http://%(ckan.site_url)/licenses.json' def get_helpers(self): - return {'getuser': get_user} + return {'get_last_active_user': get_last_active_user, 'get_user_datasets': get_user_datasets} def is_fallback(self): # Return True to register this plugin as the default handler for --- a/ckanext/datagovau/templates/package/read.html +++ b/ckanext/datagovau/templates/package/read.html @@ -44,11 +44,11 @@ {{ pkg.get('Agency Program') }} {% endif %} - {% if pkg.get('DCTERMS.Source.URI') %} + {% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %} {{ _('Source') }} - {{ h.link_to(pkg.get('DCTERMS.Source.URI'), - pkg.get('DCTERMS.Source.URI'), rel='dct:source', target='_blank') }} + {{ h.link_to(h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI'), + h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI'), rel='dct:source', target='_blank') }} {% endif %} @@ -67,11 +67,11 @@ {{ pkg.spatial_coverage }} {% endif %} - {% if pkg.get('Geospatial Coverage') %} + {% if h.get_pkg_dict_extra(pkg,'Geospatial Coverage') %} Geospatial Coverage - {{ pkg.get('Geospatial Coverage') }} + {{ h.get_pkg_dict_extra(pkg,'Geospatial Coverage') }} {% endif %} {% if pkg.get('granularity') %} @@ -81,11 +81,11 @@ {{ pkg.granularity }} {% endif %} - {% if pkg.get('Granularity') %} + {% if h.get_pkg_dict_extra(pkg,'Granularity') %} Data Granularity - {{ pkg.get('Granularity') }} + {{ h.get_pkg_dict_extra(pkg,'Granularity') }} {% endif %} {% if pkg.get('jurisdiction') %} @@ -95,11 +95,11 @@ {{ pkg.jurisdiction }} {% endif %} - {% if pkg.get('AGLSTERMS.Jurisdiction') %} + {% if h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') %} Government Jurisdiction - {{ pkg.get('AGLSTERMS.Jurisdiction') }} + {{ h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') }} {% endif %} {% if pkg.get('temporal_coverage') %} @@ -109,11 +109,11 @@ {{ pkg.temporal_coverage }} {% endif %} - {% if pkg.get('Temporal Coverage') %} + {% if h.get_pkg_dict_extra(pkg,'Temporal Coverage') %} Temporal Coverage - {{ pkg.get('Temporal Coverage') }} + {{ h.get_pkg_dict_extra(pkg,'Temporal Coverage') }} {% endif %} {% if pkg.get('data_state') %} @@ -130,26 +130,33 @@ {{ pkg.update_freq }} {% endif %} - {% if pkg.get('Update Frequency') %} + {% if h.get_pkg_dict_extra(pkg,'Update Frequency') %} Update Frequency - {{ pkg.get('Update Frequency') }} + {{ h.get_pkg_dict_extra(pkg,'Update Frequency') }} {% endif %} - {% if pkg.maintainer_email %} +{% set email =h.get_last_active_user(c.pkg_dict['id']).get('email','') %} {{ _('Maintainer') }} {{ - h.mail_to(email_address=pkg.maintainer_email, name=pkg.maintainer) }} + h.mail_to(email_address=(email or ' '), name=h.get_last_active_user(c.pkg_dict['id']).get("display_name",'')) }} - {% elif pkg.maintainer %} - {{ _('Maintainer') }} - {{ pkg.maintainer }} + Publisher/Agency + {{ c.pkg_dict['organization']['title']}} + - {% endif %} + + Type + Dataset + + + Language + English + --- a/ckanext/datagovau/templates/package/read.rdf +++ b/ckanext/datagovau/templates/package/read.rdf @@ -24,7 +24,17 @@ ${c.pkg_dict['metadata_created']} ${c.pkg_dict['metadata_modified']} en + + + ${c.pkg_dict['license_url']} + + + + ${c.pkg_dict['license_id']} + + + ${ tag_dict["name"] } @@ -44,7 +54,7 @@ ${rsc_dict.get('description')} - ${rsc_dict.get('revision_timestamp')} + ${rsc_dict.get('created')} ${rsc_dict.get('revision_timestamp')} ${rsc_dict.get('size')} ${rsc_dict.get('mimetype')} @@ -69,27 +79,25 @@ ${ c.pkg_dict['organization']['title'] } - + - ${h.get_action("user_show",{"id":username})["display_name"]} - + ${h.get_last_active_user(c.pkg_dict['id'])["display_name"]} + - - ${c.pkg_dict.get('DCTERMS.Source.URI') } + ${h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI') } ${c.pkg_dict.contact_point } ${ c.pkg_dict.spatial_coverage } - ${ c.pkg_dict.get('Geospatial Coverage') } + ${ h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage') } ${ c.pkg_dict.jurisdiction } - ${ c.pkg_dict.get('AGLSTERMS.Jurisdiction') } - ${ c.pkg_dict.temporal_coverage } - ${ c.pkg_dict.get('Temporal Coverage') } + ${ h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction') } + ${ c.pkg_dict.get('temporal_coverage') } + ${ h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage') } Data State @@ -103,17 +111,17 @@ ${ c.pkg_dict.get('update_freq') } - + Update Frequency - ${ c.pkg_dict.get('Update Frequency') } + ${ h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency') } - + Agency Program - ${ c.pkg_dict.get('Agency Program') } + ${ h.get_pkg_dict_extra(c.pkg_dict,'Agency Program') } @@ -123,10 +131,10 @@ - + Data Granularity - ${ c.pkg_dict.get('Granularity') } + ${ h.get_pkg_dict_extra(c.pkg_dict,'Granularity') } --- a/ckanext/datagovau/templates/package/read_base.html +++ b/ckanext/datagovau/templates/package/read_base.html @@ -2,10 +2,29 @@ {% block links -%} {{ super() }} + + + {% endblock -%} {% block head_extras -%} {{ super() }} + + + + + +{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}{% endif %} + + + + + + + + + + {% endblock -%} {% block package_info %} --- /dev/null +++ b/ckanext/datagovau/templates/package/resource_read.html @@ -1,1 +1,36 @@ +{% ckan_extends %} +{% block links -%} +{{ super() }} + + + +{% endblock -%} + +{% block head_extras -%} +{{ super() }} + + + + + +{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}{% endif %} + + + + + + + + + + + + + + + +{% endblock -%} + + + --- /dev/null +++ b/ckanext/datagovau/templates/user/dashboard_datasets.html @@ -1,1 +1,16 @@ +{% ckan_extends %} +{% block primary_content_inner %} +

{{ _('My Datasets') }}

+ {% if h.get_user_datasets(c.user_dict) %} + {% snippet 'snippets/package_list.html', packages=h.get_user_datasets(c.user_dict) %} + {% else %} +

+ You haven\'t created/edited any datasets. + {% if h.check_access('package_create') %} + {% link_for _('Create one now?'), controller='package', action='new' %} + {% endif %} +

+ {% endif %} +{% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/user/read.html @@ -1,1 +1,29 @@ +{% ckan_extends %} + +{% block primary_content_inner %} +

+ {% block page_heading %}{{ _('Datasets') }}{% endblock %} +

+ {% block package_list %} + {% if h.get_user_datasets(c.user_dict) %} + {% snippet 'snippets/package_list.html', packages=h.get_user_datasets(c.user_dict) %} + {% else %} + + {% if c.is_myself %} +

+ {{ _('You haven\'t created any datasets.') }} + {% if h.check_access('package_create') %} + {% link_for _('Create one now?'), controller='package', action='new' %} + {% endif %} +

+ {% else %} +

+ {{ _('User hasn\'t created any datasets.') }} +

+ {% endif %} + {% endif %} + {% endblock %} +{% endblock %} + +