Show edited and created datasets on user profile/dashboard
--- 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 @@
<td class="dataset-details"> {{ pkg.get('Agency Program') }}</td>
</tr>
{% endif %}
- {% if pkg.get('DCTERMS.Source.URI') %}
+ {% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}
<tr>
<th scope="row" class="dataset-label">{{ _('Source') }}</th>
- <td class="dataset-details" property="dct:source">{{ h.link_to(pkg.get('DCTERMS.Source.URI'),
- pkg.get('DCTERMS.Source.URI'), rel='dct:source', target='_blank') }}
+ <td class="dataset-details" property="dct:source">{{ 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') }}
</td>
</tr>
{% endif %}
@@ -67,11 +67,11 @@
<td class="dataset-details" property="dct:spatial"> {{ pkg.spatial_coverage }}</td>
</tr>
{% endif %}
- {% if pkg.get('Geospatial Coverage') %}
+ {% if h.get_pkg_dict_extra(pkg,'Geospatial Coverage') %}
<tr>
<th scope="row" class="dataset-label">Geospatial Coverage</th>
- <td class="dataset-details" property="dct:spatial"> {{ pkg.get('Geospatial Coverage') }}</td>
+ <td class="dataset-details" property="dct:spatial"> {{ h.get_pkg_dict_extra(pkg,'Geospatial Coverage') }}</td>
</tr>
{% endif %}
{% if pkg.get('granularity') %}
@@ -81,11 +81,11 @@
<td class="dataset-details"> {{ pkg.granularity }}</td>
</tr>
{% endif %}
- {% if pkg.get('Granularity') %}
+ {% if h.get_pkg_dict_extra(pkg,'Granularity') %}
<tr>
<th scope="row" class="dataset-label">Data Granularity</th>
- <td class="dataset-details"> {{ pkg.get('Granularity') }}</td>
+ <td class="dataset-details"> {{ h.get_pkg_dict_extra(pkg,'Granularity') }}</td>
</tr>
{% endif %}
{% if pkg.get('jurisdiction') %}
@@ -95,11 +95,11 @@
<td class="dataset-details" property="aglsterms:AglsJuri"> {{ pkg.jurisdiction }}</td>
</tr>
{% endif %}
- {% if pkg.get('AGLSTERMS.Jurisdiction') %}
+ {% if h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') %}
<tr>
<th scope="row" class="dataset-label">Government Jurisdiction</th>
- <td class="dataset-details" property="aglsterms:AglsJuri"> {{ pkg.get('AGLSTERMS.Jurisdiction') }}</td>
+ <td class="dataset-details" property="aglsterms:AglsJuri"> {{ h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') }}</td>
</tr>
{% endif %}
{% if pkg.get('temporal_coverage') %}
@@ -109,11 +109,11 @@
<td class="dataset-details" property="dct:temporal"> {{ pkg.temporal_coverage }}</td>
</tr>
{% endif %}
- {% if pkg.get('Temporal Coverage') %}
+ {% if h.get_pkg_dict_extra(pkg,'Temporal Coverage') %}
<tr>
<th scope="row" class="dataset-label">Temporal Coverage</th>
- <td class="dataset-details" property="dct:temporal"> {{ pkg.get('Temporal Coverage') }}</td>
+ <td class="dataset-details" property="dct:temporal"> {{ h.get_pkg_dict_extra(pkg,'Temporal Coverage') }}</td>
</tr>
{% endif %}
{% if pkg.get('data_state') %}
@@ -130,26 +130,33 @@
<td class="dataset-details"> {{ pkg.update_freq }}</td>
</tr>
{% endif %}
- {% if pkg.get('Update Frequency') %}
+ {% if h.get_pkg_dict_extra(pkg,'Update Frequency') %}
<tr>
<th scope="row" class="dataset-label">Update Frequency</th>
- <td class="dataset-details"> {{ pkg.get('Update Frequency') }}</td>
+ <td class="dataset-details"> {{ h.get_pkg_dict_extra(pkg,'Update Frequency') }}</td>
</tr>
{% endif %}
- {% if pkg.maintainer_email %}
+{% set email =h.get_last_active_user(c.pkg_dict['id']).get('email','') %}
<tr>
<th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
<td class="dataset-details" property="dc:contributor">{{
- 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",'')) }}
</td>
</tr>
- {% elif pkg.maintainer %}
<tr>
- <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
- <td class="dataset-details" property="dc:contributor">{{ pkg.maintainer }}</td>
+ <th scope="row" class="dataset-label">Publisher/Agency</th>
+ <td class="dataset-details" property="dc:publisher">{{ c.pkg_dict['organization']['title']}}
+ </td>
</tr>
- {% endif %}
+ <tr>
+ <th scope="row" class="dataset-label">Type</th>
+ <td class="dataset-details" property="dc:type">Dataset</td>
+ </tr>
+ <tr>
+ <th scope="row" class="dataset-label">Language</th>
+ <td class="dataset-details" property="dc:language">English</td>
+ </tr>
</tbody>
</table>
--- a/ckanext/datagovau/templates/package/read.rdf
+++ b/ckanext/datagovau/templates/package/read.rdf
@@ -24,7 +24,17 @@
<dct:issued>${c.pkg_dict['metadata_created']}</dct:issued>
<dct:modified>${c.pkg_dict['metadata_modified']}</dct:modified>
<dct:language>en</dct:language>
+
+<py:choose>
+ <py:when test="c.pkg_dict.get('license_url',None)">
<dct:license>${c.pkg_dict['license_url']}</dct:license>
+ <dct:rights rdf:resource="${c.pkg_dict['license_url']}"/>
+ </py:when>
+ <py:otherwise>
+ <dct:license>${c.pkg_dict['license_id']}</dct:license>
+ <dct:rights rdf:resource="${c.pkg_dict['license_id']}"/>
+ </py:otherwise>
+</py:choose>
<py:for each="tag_dict in c.pkg_dict.get('tags',[])">
<dcat:keyword>${ tag_dict["name"] }</dcat:keyword>
</py:for>
@@ -69,27 +79,25 @@
<foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name>
</rdf:Description>
</dct:creator>
- <dct:contributor
- py:with="username = h.get_action('package_activity_list',{'id':c.pkg_dict['id']})[0]['user_id']">
+ <dct:contributor>
<rdf:Description>
- <foaf:name>${h.get_action("user_show",{"id":username})["display_name"]}</foaf:name>
- <foaf:mbox py:if="h.get_action('user_show',{'id':username}).get('email', None)"
- rdf:resource="mailto:${h.get_action('user_show',{'id':username})['email']}"/>
+ <foaf:name>${h.get_last_active_user(c.pkg_dict['id'])["display_name"]}</foaf:name>
+ <foaf:mbox py:if="h.get_last_active_user(c.pkg_dict['id']).get('email', None)"
+ rdf:resource="mailto:${h.get_last_active_user(c.pkg_dict['id'])['email']}"/>
</rdf:Description>
</dct:contributor>
- <dct:rights py:if="c.pkg_dict.get('license_url', None)" rdf:resource="${c.pkg_dict['license_url']}"/>
- <foaf:homepage py:if="c.pkg_dict.get('DCTERMS.Source.URI')">${c.pkg_dict.get('DCTERMS.Source.URI') }
+ <foaf:homepage py:if="h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI')">${h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI') }
</foaf:homepage>
<dcat:contactPoint py:if="c.pkg_dict.get('contact_point')">${c.pkg_dict.contact_point }</dcat:contactPoint>
<dct:spatial py:if="c.pkg_dict.get('spatial_coverage')">${ c.pkg_dict.spatial_coverage }</dct:spatial>
- <dct:spatial py:if="c.pkg_dict.get('Geospatial Coverage')">${ c.pkg_dict.get('Geospatial Coverage') }</dct:spatial>
+ <dct:spatial py:if="h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage') }</dct:spatial>
<aglsterms:AglsJuri py:if="c.pkg_dict.get('jurisdiction')">${ c.pkg_dict.jurisdiction }</aglsterms:AglsJuri>
- <aglsterms:AglsJuri py:if="c.pkg_dict.get('AGLSTERMS.Jurisdiction')">${ c.pkg_dict.get('AGLSTERMS.Jurisdiction') }</aglsterms:AglsJuri>
- <dct:temporal py:if="c.pkg_dict.temporal_coverage">${ c.pkg_dict.temporal_coverage }</dct:temporal>
- <dct:temporal py:if="c.pkg_dict.get('Temporal Coverage')">${ c.pkg_dict.get('Temporal Coverage') }</dct:temporal>
+ <aglsterms:AglsJuri py:if="h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction')">${ h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction') }</aglsterms:AglsJuri>
+ <dct:temporal py:if="c.pkg_dict.get('temporal_coverage')">${ c.pkg_dict.get('temporal_coverage') }</dct:temporal>
+ <dct:temporal py:if="h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage') }</dct:temporal>
<dct:relation py:if="c.pkg_dict.get('data_state')">
<rdf:Description>
<rdfs:label>Data State</rdfs:label>
@@ -103,17 +111,17 @@
<rdf:value>${ c.pkg_dict.get('update_freq') }</rdf:value>
</rdf:Description>
</dct:relation>
- <dct:relation py:if="c.pkg_dict.get('Update Frequency')">
+ <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency')">
<rdf:Description>
<rdfs:label>Update Frequency</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('Update Frequency') }</rdf:value>
+ <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency') }</rdf:value>
</rdf:Description>
</dct:relation>
- <dct:relation py:if="c.pkg_dict.get('Agency Program')">
+ <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Agency Program')">
<rdf:Description>
<rdfs:label>Agency Program</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('Agency Program') }</rdf:value>
+ <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Agency Program') }</rdf:value>
</rdf:Description>
</dct:relation>
<dct:relation py:if="c.pkg_dict.get('agency_program')">
@@ -123,10 +131,10 @@
</rdf:Description>
</dct:relation>
- <dct:relation py:if="c.pkg_dict.get('Granularity')">
+ <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Granularity')">
<rdf:Description>
<rdfs:label>Data Granularity</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('Granularity') }</rdf:value>
+ <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Granularity') }</rdf:value>
</rdf:Description>
</dct:relation>
<dct:relation py:if="c.pkg_dict.get('granularity')">
--- a/ckanext/datagovau/templates/package/read_base.html
+++ b/ckanext/datagovau/templates/package/read_base.html
@@ -14,11 +14,11 @@
<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_modified']}}" />
<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_created']}}" />
-{% if pkg.get('DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{pkg.get('DCTERMS.Source.URI')}}" />{% endif %}
+{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %}
<meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
-<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or pkg.get('Temporal Coverage')}}" />
-<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or pkg.get('Geospatial Coverage')}}" />
-<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or pkg.get('AGLSTERMS.Jurisdiction')}}" />
+<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" />
+<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" />
+<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" />
<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" />
<meta name="DCTERMS.Identifier" content="{{h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}}" />
<meta name="DCTERMS.Title" content="{{pkg['title']}}" />
--- a/ckanext/datagovau/templates/package/resource_read.html
+++ b/ckanext/datagovau/templates/package/resource_read.html
@@ -14,11 +14,11 @@
<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{res['revision_timestamp']}}" />
<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{res['created']}}" />
-{% if pkg.get('DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{pkg.get('DCTERMS.Source.URI')}}" />{% endif %}
+{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %}
<meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
-<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or pkg.get('Temporal Coverage')}}" />
-<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or pkg.get('Geospatial Coverage')}}" />
-<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or pkg.get('AGLSTERMS.Jurisdiction')}}" />
+<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" />
+<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" />
+<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" />
<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" />
<meta name="DCAT.byteSize" content="{{res.get('size')}}" />
<meta name="DCAT.mediaType" content="{{res.get('mimetype')}}" />
--- /dev/null
+++ b/ckanext/datagovau/templates/user/dashboard_datasets.html
@@ -1,1 +1,16 @@
+{% ckan_extends %}
+{% block primary_content_inner %}
+ <h2 class="page-heading">{{ _('My Datasets') }}</h2>
+ {% if h.get_user_datasets(c.user_dict) %}
+ {% snippet 'snippets/package_list.html', packages=h.get_user_datasets(c.user_dict) %}
+ {% else %}
+ <p class="empty">
+ You haven\'t created/edited any datasets.
+ {% if h.check_access('package_create') %}
+ {% link_for _('Create one now?'), controller='package', action='new' %}
+ {% endif %}
+ </p>
+ {% endif %}
+{% endblock %}
+
--- /dev/null
+++ b/ckanext/datagovau/templates/user/read.html
@@ -1,1 +1,29 @@
+{% ckan_extends %}
+
+{% block primary_content_inner %}
+ <h2 class="hide-heading">
+ {% block page_heading %}{{ _('Datasets') }}{% endblock %}
+ </h2>
+ {% 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 %}
+ <p class="empty">
+ {{ _('You haven\'t created any datasets.') }}
+ {% if h.check_access('package_create') %}
+ {% link_for _('Create one now?'), controller='package', action='new' %}
+ {% endif %}
+ </p>
+ {% else %}
+ <p class="empty">
+ {{ _('User hasn\'t created any datasets.') }}
+ </p>
+ {% endif %}
+ {% endif %}
+ {% endblock %}
+{% endblock %}
+
+