diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 562fee6f7a0..a8f035f28f6 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -444,9 +444,8 @@ def new(self, data=None, errors=None, error_summary=None): return self._save_new(context) data = data or clean_dict(unflatten(tuplize_dict(parse_params( - request.params, ignore_keys=CACHE_PARAMETERS)))) + request.POST, ignore_keys=CACHE_PARAMETERS)))) c.resources_json = json.dumps(data.get('resources', [])) - # convert tags if not supplied in data if data and not data.get('tag_string'): data['tag_string'] = ', '.join( @@ -462,6 +461,11 @@ def new(self, data=None, errors=None, error_summary=None): elif data.get('state') == 'draft-complete': stage = ['active', 'complete', 'complete'] + # if we are creating from a group then this allows the group to be + # set automatically + data['group_id'] = request.params.get('group') or \ + request.params.get('groups__0__id') + vars = {'data': data, 'errors': errors, 'error_summary': error_summary, 'action': 'new', 'stage': stage} diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index 03d3d5fb92b..cd26d8b5bcb 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -9,7 +9,7 @@ {% block actions_content %} {% if h.check_access('group_update', {'id': c.group.id}) %} -
  • {% link_for _('Add Dataset'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='plus' %}
  • +
  • {% link_for _('Add Dataset to Group'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus' %}
  • {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='cog' %}
  • {% endif %} {#
  • {% link_for _('History'), controller='group', action='history', id=c.group_dict.name, class_='btn', icon='undo' %}
  • #} diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html index e88b0d24363..994ab0149bc 100644 --- a/ckan/templates/package/snippets/package_basic_fields.html +++ b/ckan/templates/package/snippets/package_basic_fields.html @@ -32,3 +32,8 @@ + +{# if we have a default group then this wants remembering #} +{% if data.group_id %} + +{% endif %}