From d0506f3a3e0dda47fbc60d10a155e0f5d5a9d452 Mon Sep 17 00:00:00 2001 From: Toby Date: Fri, 22 Jun 2012 10:59:58 +0100 Subject: [PATCH] [#2558] groups_available helper function added --- ckan/lib/helpers.py | 9 +++++++++ ckan/templates/package/new_package_metadata.html | 2 +- .../package/snippets/package_metadata_fields.html | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 37cc1622c42..899b564a6d6 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -1152,6 +1152,14 @@ def popular(type_, number, min=1, title=None): raise Exception('popular() did not recieve a valid type_ or title') return snippet('snippets/popular.html', title=title, number=number, min=min) +def groups_available(): + ''' return a list of available groups ''' + import ckan.logic as logic + context = {'model': model, 'session': model.Session, + 'user': c.user or c.author} + data_dict = {'available_only': True} + return logic.get_action('group_list_authz')(context, data_dict) + # these are the functions that will end up in `h` template helpers # if config option restrict_template_vars is true __allowed_functions__ = [ @@ -1220,6 +1228,7 @@ def popular(type_, number, min=1, title=None): 'follow_count', 'remove_url_param', 'add_url_param', + 'groups_available', # imported into ckan.lib.helpers 'literal', 'link_to', diff --git a/ckan/templates/package/new_package_metadata.html b/ckan/templates/package/new_package_metadata.html index cf0c4f7d94e..b6fd25ba635 100644 --- a/ckan/templates/package/new_package_metadata.html +++ b/ckan/templates/package/new_package_metadata.html @@ -4,4 +4,4 @@ {% block stages %}{{ h.snippet('package/snippets/stages.html', stage=3) }}{% endblock %} -{% block form %}{{ h.snippet('package/snippets/package_metadata_form.html', data=data, errors=errors, groups_available=c.groups_available, include_metadata=false) }}{% endblock %} +{% block form %}{{ h.snippet('package/snippets/package_metadata_form.html', data=data, errors=errors, include_metadata=false) }}{% endblock %} diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html index 0338d1c0b15..355dca19f1b 100644 --- a/ckan/templates/package/snippets/package_metadata_fields.html +++ b/ckan/templates/package/snippets/package_metadata_fields.html @@ -1,5 +1,6 @@ {% import 'macros/form.html' as form %} +{% set groups_available = h.groups_available() %} {% if groups_available %}
{% set groups = data.groups or [] %}