Merge branch 'master' into ODPSH-118

ckanext/odsh/logic/action.py

 import logging
-from ckan.logic.action.create import package_create
+from ckan.logic.action.create import package_create, user_create, group_member_create
 import ckan.model as model
+import ckan.lib.dictization.model_dictize as model_dictize
+import ckan.plugins.toolkit as toolkit
 
 log = logging.getLogger(__name__)
 
 
 def odsh_package_create(context, data_dict):
-    log.debug('in ODSH package_create')
     munge_increment_name(data_dict)
     return package_create(context, data_dict)
 
+
 def munge_increment_name(data_dict):
-    log.debug('IN MUNGE')
     from ckan.lib.munge import munge_title_to_name
 
     name_base = name = munge_title_to_name(data_dict['title'])
@@ -23,3 +24,12 @@ def munge_increment_name(data_dict):
         pkg = model.Package.get(name)
     log.debug('name: %s' % name)
     data_dict['name'] = name
+
+
+def odsh_user_create(context, data_dict):
+    model = context['model']
+    user = user_create(context, data_dict)
+    groups = toolkit.get_action('group_list')(data_dict={'all_fields': False})
+    for group in groups:
+        group_member_create(context, {'id': group, 'username': user.get('name'), 'role': 'member'})
+    return model_dictize.user_dictize(model.User.get(user.get('name')), context)

ckanext/odsh/plugin.py

@@ -82,7 +82,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
     # IActions
 
     def get_actions(self):
-        return {'package_create': action.odsh_package_create}
+        return {'package_create': action.odsh_package_create,
+                'user_create': action.odsh_user_create}
 
     # IConfigurer
 

ckanext/odsh/templates/package/search.html

@@ -15,22 +15,7 @@
       {% block page_primary_action %}
       {% endblock %}
       {% block form %}
-        {% set facets = {
-          'fields': c.fields_grouped,
-          'search': c.search_facets,
-          'titles': c.facet_titles,
-          'translated_fields': c.translated_fields,
-          'remove_field': c.remove_field }
-        %}
-        {% set sorting = [
-          (_('Relevance'), 'score desc, metadata_modified desc'),
-          (_('Name Ascending'), 'title_string asc'),
-          (_('Name Descending'), 'title_string desc'),
-          (_('Issued Ascending'), 'extras_issued asc'),
-          (_('Issued Descending'), 'extras_issued desc'),
-          (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
-        %}
-        {% snippet 'snippets/search_form.html', form_id='dataset-search-form', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, show_empty=request.params, error=c.query_error, fields=c.fields %}
+        {{ super() }}
       {% endblock %}
       {% block package_search_results_list %}
         {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}

ckanext/odsh/templates/snippets/search_box.html

 <div class='search-box-container'>
     <div class='search-box'>
             <div class="field">
-                <input id="field-sitewide-search" type="text" value="{{c.q}}" name="q" placeholder="{{ _('Search dataset') }}" />
+                <input id="field-sitewide-search" class="search" type="text" value="{{c.q}}" name="q" placeholder="{{ _('Search dataset') }}" />
                 <button class="btn-search" type="submit">
             </div>
     </div>

ckanext/odsh/templates/snippets/search_form.html

@@ -2,7 +2,14 @@
 
 {% set placeholder = placeholder if placeholder else _('Search datasets...') %}
 {% set sorting_label_prefix = _('Order by') %}
-{% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
+{% set sorting = [
+          (_('Relevance'), 'score desc, metadata_modified desc'),
+          (_('Name Ascending'), 'title_string asc'),
+          (_('Name Descending'), 'title_string desc'),
+          (_('Issued Ascending'), 'extras_issued asc'),
+          (_('Issued Descending'), 'extras_issued desc'),
+          (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+        %}
 {% set search_class = search_class if search_class else 'search-giant' %}
 {% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
 {% set form_id = form_id if form_id else false %}