From 660fc8194233a2b746c239a7b731218d66cf53ec Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Sun, 29 Sep 2013 17:56:01 +0100
Subject: [PATCH 01/10] basic group add remove done with out any styling

---
 ckan/config/routing.py                    |  3 ++
 ckan/controllers/package.py               | 59 +++++++++++++++++++++++
 ckan/logic/action/create.py               |  3 +-
 ckan/logic/action/delete.py               |  3 +-
 ckan/logic/action/get.py                  |  3 +-
 ckan/logic/auth/create.py                 | 21 ++++++++
 ckan/new_authz.py                         |  4 +-
 ckan/templates/package/group_list.html    | 32 ++++++++++++
 ckan/templates/package/read_base.html     |  1 +
 ckan/templates/snippets/package_list.html |  2 +-
 10 files changed, 123 insertions(+), 8 deletions(-)
 create mode 100644 ckan/templates/package/group_list.html

diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index 0fbb02bb886..8bb15623082 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -230,6 +230,7 @@ def make_map():
                       'history_ajax',
                       'follow',
                       'activity',
+                      'groups',
                       'unfollow',
                       'delete',
                       'api_data',
@@ -239,6 +240,8 @@ def make_map():
         m.connect('dataset_activity', '/dataset/activity/{id}',
                   action='activity', ckan_icon='time')
         m.connect('/dataset/activity/{id}/{offset}', action='activity')
+        m.connect('dataset_groups', '/dataset/groups/{id}',
+                  action='groups', ckan_icon='group')
         m.connect('/dataset/{id}.{format}', action='read')
         m.connect('dataset_read', '/dataset/{id}', action='read',
                   ckan_icon='sitemap')
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index d1852cd95b7..7feab9c2f95 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -1246,6 +1246,65 @@ def followers(self, id=None):
 
         return render('package/followers.html')
 
+    def groups(self, id):
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user or c.author, 'for_view': True,
+                   'auth_user_obj': c.userobj}
+        data_dict = {'id': id}
+        try:
+            c.pkg_dict = get_action('package_show')(context, data_dict)
+        except NotFound:
+            abort(404, _('Dataset not found'))
+        except NotAuthorized:
+            abort(401, _('Unauthorized to read dataset %s') % id)
+
+        if request.method == 'POST':
+            new_group = request.POST.get('group_added')
+            if new_group:
+                data_dict = {"id": new_group,
+                             "object": id,
+                             "object_type": 'package',
+                             "capacity": 'public'}
+                try:
+                    get_action('member_create')(context, data_dict)
+                except NotFound:
+                    abort(404, _('Group not found'))
+
+            removed_group = request.POST.get('group_removed')
+            if removed_group:
+                data_dict = {"id": removed_group,
+                             "object": id,
+                             "object_type": 'package'}
+
+                try:
+                    get_action('member_delete')(context, data_dict)
+                except NotFound:
+                    abort(404, _('Group not found'))
+            redirect(h.url_for(controller='package',
+                               action='groups', id=id))
+
+
+
+        context['is_member'] = True
+        users_groups = get_action('group_list_authz')(context, data_dict)
+
+        pkg_group_ids = set(group['id'] for group
+                         in c.pkg_dict.get('groups', []))
+        user_group_ids = set(group['id'] for group
+                          in users_groups)
+
+        c.group_dropdown = [[group['id'], group['display_name']]
+                           for group in users_groups if
+                           group['id'] not in pkg_group_ids]
+
+        for group in c.pkg_dict.get('groups', []):
+            ## this could be pushed back to package dictize
+            group['display_name'] = group.get('titile') or group.get('name')
+            group['user_member'] = (group['id'] in user_group_ids)
+
+
+        return render('package/group_list.html')
+
     def activity(self, id):
         '''Render this package's public activity stream page.'''
 
diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
index baac5a2154c..d868aac62b4 100644
--- a/ckan/logic/action/create.py
+++ b/ckan/logic/action/create.py
@@ -446,8 +446,7 @@ def member_create(context, data_dict=None):
     if not obj:
         raise NotFound('%s was not found.' % obj_type.title())
 
-    # User must be able to update the group to add a member to it
-    _check_access('group_update', context, data_dict)
+    _check_access('member_create', context, data_dict)
 
     # Look up existing, in case it exists
     member = model.Session.query(model.Member).\
diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py
index 60ea1a5bed8..1d3b5fe879c 100644
--- a/ckan/logic/action/delete.py
+++ b/ckan/logic/action/delete.py
@@ -203,8 +203,7 @@ def member_delete(context, data_dict=None):
     if not obj:
         raise NotFound('%s was not found.' % obj_type.title())
 
-    # User must be able to update the group to remove a member from it
-    _check_access('group_update', context, data_dict)
+    _check_access('member_create', context, data_dict)
 
     member = model.Session.query(model.Member).\
             filter(model.Member.table_name == obj_type).\
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index 4f4b2fb57ee..89f2ad97c55 100644
--- a/ckan/logic/action/get.py
+++ b/ckan/logic/action/get.py
@@ -331,6 +331,7 @@ def translated_capacity(capacity):
 def _group_or_org_list(context, data_dict, is_org=False):
 
     model = context['model']
+    user = context['user']
     api = context.get('api_version')
     groups = data_dict.get('groups')
     ref_group_by = 'id' if api == 2 else 'name'
@@ -460,7 +461,7 @@ def group_list_authz(context, data_dict):
     _check_access('group_list_authz',context, data_dict)
 
     sysadmin = new_authz.is_sysadmin(user)
-    roles = ckan.new_authz.get_roles_with_permission('edit_group')
+    roles = ckan.new_authz.get_roles_with_permission('manage_group')
     if not roles:
         return []
     user_id = new_authz.get_user_id_for_username(user, allow_none=True)
diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py
index a18485c2c57..c6dd89527d8 100644
--- a/ckan/logic/auth/create.py
+++ b/ckan/logic/auth/create.py
@@ -1,5 +1,6 @@
 import ckan.logic as logic
 import ckan.new_authz as new_authz
+import ckan.logic.auth as logic_auth
 
 from ckan.common import _
 
@@ -197,3 +198,23 @@ def organization_member_create(context, data_dict):
 
 def group_member_create(context, data_dict):
     return _group_or_org_member_create(context, data_dict)
+
+def member_create(context, data_dict):
+    group = logic_auth.get_group_object(context, data_dict)
+    user = context['user']
+
+    # User must be able to update the group to add a member to it
+    permission = 'update'
+    # However if the user is member of group then they can add/remove datasets
+    if not group.is_organization and data_dict.get('object_type') == 'package':
+        permission = 'manage_group'
+
+    authorized = new_authz.has_user_permission_for_group_or_org(group.id,
+                                                                user,
+                                                                permission)
+    if not authorized:
+        return {'success': False,
+                'msg': _('User %s not authorized to edit group %s') %
+                        (str(user), group.id)}
+    else:
+        return {'success': True}
diff --git a/ckan/new_authz.py b/ckan/new_authz.py
index abeb8f9b57a..af224ee67b7 100644
--- a/ckan/new_authz.py
+++ b/ckan/new_authz.py
@@ -183,8 +183,8 @@ def is_authorized(action, context, data_dict=None):
 # these are the permissions that roles have
 ROLE_PERMISSIONS = OrderedDict([
     ('admin', ['admin']),
-    ('editor', ['read', 'delete_dataset', 'create_dataset', 'update_dataset']),
-    ('member', ['read']),
+    ('editor', ['read', 'delete_dataset', 'create_dataset', 'update_dataset', 'manage_group']),
+    ('member', ['read', 'manage_group']),
 ])
 
 
diff --git a/ckan/templates/package/group_list.html b/ckan/templates/package/group_list.html
new file mode 100644
index 00000000000..63440bfacb7
--- /dev/null
+++ b/ckan/templates/package/group_list.html
@@ -0,0 +1,32 @@
+{% import 'macros/form.html' as form %}
+{% extends "package/read_base.html" %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{% block page_heading %}{{ _('Groups {dataset} belongs to.').format(dataset=h.dataset_display_name(c.pkg)) }}{% endblock %}</h2>
+
+  {% if c.group_dropdown %}
+  <form class="module-content form-horizontal" method='post'>
+    <select id="field-add_group" name="group_added">
+      {% for option in c.group_dropdown %}
+        <option value="{{ option[0] }}"> {{ option[1] }}</option>
+      {% endfor %}
+    </select>
+    <button type="submit"> <span>Add Group</span></button>
+  </form>
+  {% endif %}
+  
+  <ul class="unstyled">
+  {% for group in c.pkg_dict.groups %}
+  <li class="dataset-item"> {{group.display_name}}   
+     <form class="unstyled" method='post'>
+         {% if group.user_member %}
+             <button name="group_removed" value="{{group.id}}" type="submit"> <span>Remove Group</span> </button>
+         {% endif %}
+     </form> 
+  </li> 
+
+  {% endfor %}
+  </ul>
+
+
+{% endblock %}
diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index 9cf73a5c5a1..0e4b3775f43 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -22,6 +22,7 @@
 
 {% block content_primary_nav %}
   {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }}
+  {{ h.build_nav_icon('dataset_groups', _('Groups'), id=pkg.name) }}
   {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }}
   {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }}
 {% endblock %}
diff --git a/ckan/templates/snippets/package_list.html b/ckan/templates/snippets/package_list.html
index 99aed748242..75213d535a3 100644
--- a/ckan/templates/snippets/package_list.html
+++ b/ckan/templates/snippets/package_list.html
@@ -15,7 +15,7 @@
 
 #}
 {% if packages %}
-  <ul class="{{ list_class or 'dataset-list unstyled' }}">
+  <ul class="dataset-list unstyled">
     {% for package in packages %}
       {% snippet 'snippets/package_item.html', package=package, item_class=item_class, hide_resources=hide_resources, banner=banner, truncate=truncate, truncate_title=truncate_title %}
     {% endfor %}

From bfad157979c406631ebb28185605db7ab7320626 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Mon, 30 Sep 2013 11:43:31 +0100
Subject: [PATCH 02/10] [#1102] various group ui cleanups

---
 ckan/controllers/group.py                        |  2 +-
 ckan/logic/action/get.py                         | 11 ++++++++++-
 ckan/templates/group/member_new.html             |  9 +++------
 ckan/templates/group/read.html                   |  4 ----
 .../snippets/package_metadata_fields.html        | 16 ----------------
 5 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py
index ccef46bfe78..8e42b24dac8 100644
--- a/ckan/controllers/group.py
+++ b/ckan/controllers/group.py
@@ -622,7 +622,7 @@ def member_new(self, id):
                 else:
                     c.user_role = 'member'
                 c.group_dict = self._action('group_show')(context, {'id': id})
-                c.roles = self._action('member_roles_list')(context, {})
+                c.roles = self._action('member_roles_list')(context, {'group_type': 'group'})
         except NotAuthorized:
             abort(401, _('Unauthorized to add member to group %s') % '')
         except NotFound:
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index 89f2ad97c55..b5ef3506887 100644
--- a/ckan/logic/action/get.py
+++ b/ckan/logic/action/get.py
@@ -2907,11 +2907,20 @@ def _unpick_search(sort, allowed_fields=None, total=None):
 def member_roles_list(context, data_dict):
     '''Return the possible roles for members of groups and organizations.
 
+    :param group_type: the group type, either "group" or "organization"
+        (optional, default "organization")
+    :type id: string
     :returns: a list of dictionaries each with two keys: "text" (the display
         name of the role, e.g. "Admin") and "value" (the internal name of the
         role, e.g. "admin")
     :rtype: list of dictionaries
 
     '''
+    group_type = data_dict.get('group_type', 'organization')
+    roles_list = new_authz.roles_list()
+    if group_type == 'group':
+        roles_list = [role for role in roles_list
+                      if role['value'] != 'editor']
+
     _check_access('member_roles_list', context, data_dict)
-    return new_authz.roles_list()
+    return roles_list
diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html
index 14e281d75b2..efb1b79dc3d 100644
--- a/ckan/templates/group/member_new.html
+++ b/ckan/templates/group/member_new.html
@@ -47,12 +47,9 @@ <h2 class="module-heading">
     </h2>
     <div class="module-content">
       {% trans %}
-        <p><strong>Admin:</strong> Can add/edit and delete datasets, as well as
-          manage group members.</p>
-        <p><strong>Editor:</strong> Can add and edit datasets, but not manage
-          group members.</p>
-        <p><strong>Member:</strong> Can view the group's private
-          datasets, but not add new datasets.</p>
+         <p><strong>Admin:</strong> Can edit group information, as well as
+           manage organization members.</p>
+         <p><strong>Member:</strong> Can add/remove datasets from groups</p>
       {% endtrans %}
     </div>
   </div>
diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
index 8218edb4b37..81b967e53d7 100644
--- a/ckan/templates/group/read.html
+++ b/ckan/templates/group/read.html
@@ -2,10 +2,6 @@
 
 {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
 
-{% block page_primary_action %}
-  {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
-{% endblock %}
-
 {% block primary_content_inner %}
   {% block groups_search_form %}
     {% set facets = {
diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html
index ac841ddd4d0..c0a8a62dbe6 100644
--- a/ckan/templates/package/snippets/package_metadata_fields.html
+++ b/ckan/templates/package/snippets/package_metadata_fields.html
@@ -21,22 +21,6 @@
   {% endblock %}
 
   {% block dataset_fields %}
-    {% if data.groups %}
-      <div class="control-group">
-        <label class="control-label">{{ _('Groups') }}</label>
-        <div class="controls">
-          {% for group in data.groups %}
-            <label class="checkbox" for="field-group-{{ loop.index0 }}">
-              <input id="field-group-{{ loop.index0 }}" type="checkbox" name="groups__{{ loop.index0 }}__id" value="{{ group.id }}" checked="checked" />
-              {{ group.title }}
-            </label>
-          {% endfor %}
-        </div>
-      </div>
-    {% endif %}
-    {% set group_name = 'groups__%s__id' % data.groups|length %}
-    {% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %}
-    {{ form.input(group_name, label=_('Add Group'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }}
   {% endblock %}
 
 {% endblock %}

From d4cd29041bbb526473a11c1a683aedac04586d9b Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Tue, 1 Oct 2013 14:47:30 +0100
Subject: [PATCH 03/10] [#1102] Improves the groups list within package
 template

---
 ckan/templates/group/snippets/group_item.html |  6 ++-
 ckan/templates/package/group_list.html        | 41 ++++++++-----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/ckan/templates/group/snippets/group_item.html b/ckan/templates/group/snippets/group_item.html
index 9e32ce86e6a..0c035e44596 100644
--- a/ckan/templates/group/snippets/group_item.html
+++ b/ckan/templates/group/snippets/group_item.html
@@ -11,7 +11,8 @@
       {% endfor %}
     </ul>
 #}
-{% set url = h.url_for(group.type ~ '_read', action='read', id=group.name) %}
+{% set type = group.type or 'group' %}
+{% set url = h.url_for(type ~ '_read', action='read', id=group.name) %}
 <li class="media-item">
   {% block image %}
     <img src="{{ group.image_url or '/base/images/placeholder-group.png' }}" alt="{{ group.name }}" class="media-image">
@@ -36,6 +37,9 @@ <h3 class="media-heading">{{ group.display_name }}</h3>
   <a href="{{ url }}" title="{{ _('View {name}').format(name=group.display_name) }}" class="media-view">
     <span>{{ _('View {name}').format(name=group.display_name) }}</span>
   </a>
+  {% if group.user_member %}
+    <button name="group_removed" value="{{ group.id }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove this group from dataset') }}">{{ _('Remove') }}</button>
+  {% endif %}
 </li>
 {% if position is divisibleby 3 %}
   <li class="clearfix js-hide"></li>
diff --git a/ckan/templates/package/group_list.html b/ckan/templates/package/group_list.html
index 63440bfacb7..190c95a51cf 100644
--- a/ckan/templates/package/group_list.html
+++ b/ckan/templates/package/group_list.html
@@ -1,32 +1,27 @@
-{% import 'macros/form.html' as form %}
 {% extends "package/read_base.html" %}
+{% import 'macros/form.html' as form %}
 
 {% block primary_content_inner %}
-  <h2 class="hide-heading">{% block page_heading %}{{ _('Groups {dataset} belongs to.').format(dataset=h.dataset_display_name(c.pkg)) }}{% endblock %}</h2>
+  <h2 class="hide-heading">{{ _('Groups') }}</h2>
 
   {% if c.group_dropdown %}
-  <form class="module-content form-horizontal" method='post'>
-    <select id="field-add_group" name="group_added">
-      {% for option in c.group_dropdown %}
-        <option value="{{ option[0] }}"> {{ option[1] }}</option>
-      {% endfor %}
-    </select>
-    <button type="submit"> <span>Add Group</span></button>
-  </form>
+    <form method="post" class="form-horizontal">
+    {#'data-module': ''#}
+      <select id="field-add_group" name="group_added" data-module="autocomplete">
+        {% for option in c.group_dropdown %}
+          <option value="{{ option[0] }}"> {{ option[1] }}</option>
+        {% endfor %}
+      </select>
+      <button type="submit" class="btn btn-primary" title="{{ _('Associate this group with this dataset') }}">{{ _('Add group') }}</button>
+    </form>
   {% endif %}
-  
-  <ul class="unstyled">
-  {% for group in c.pkg_dict.groups %}
-  <li class="dataset-item"> {{group.display_name}}   
-     <form class="unstyled" method='post'>
-         {% if group.user_member %}
-             <button name="group_removed" value="{{group.id}}" type="submit"> <span>Remove Group</span> </button>
-         {% endif %}
-     </form> 
-  </li> 
-
-  {% endfor %}
-  </ul>
 
+  {% if c.pkg_dict.groups %}
+    <form method="post">
+      {% snippet 'group/snippets/group_list.html', groups=c.pkg_dict.groups %}
+    </form>
+  {% else %}
+    <p class="empty">{{ _('There are no groups associated with this dataset') }}</p>
+  {% endif %}
 
 {% endblock %}

From 3fb00598daee5be79e245bfc351a47ea0d4b4987 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Tue, 1 Oct 2013 14:48:00 +0100
Subject: [PATCH 04/10] [#1102] Remove old sidebar groups since we now have tab
 for them

---
 ckan/templates/package/read_base.html | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index 0e4b3775f43..7b1baec54ad 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -73,23 +73,6 @@ <h1 class="heading">{{ pkg.title or pkg.name }}</h1>
     {% endif %}
   {% endblock %}
 
-  {% block package_groups %}
-    {% if pkg.groups %}
-      <div class="module module-narrow">
-        <h2 class="module-heading"><i class="icon-folder-open"></i> {{ _('Groups') }}</h2>
-        <ul class="nav nav-simple">
-          {% for group in pkg.groups %}
-            <li class="nav-item">
-              <a href="{{ h.url_for(controller='group', action='read', id=group.name) }}">
-                {{ group.title or group.name }}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    {% endif %}
-  {% endblock %}
-
   {% block package_social %}
     {% snippet "snippets/social.html" %}
   {% endblock %}

From 8ce0b90e813e3d312dcb89d133c243051523dd76 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Fri, 11 Oct 2013 15:55:53 +0100
Subject: [PATCH 05/10] #1102 fix blacklist test

---
 ckan/tests/test_coding_standards.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py
index f0b7469c3f4..2ba18e07232 100644
--- a/ckan/tests/test_coding_standards.py
+++ b/ckan/tests/test_coding_standards.py
@@ -910,7 +910,6 @@ class TestActionAuth(object):
         'create: follow_dataset',
         'create: follow_group',
         'create: follow_user',
-        'create: member_create',
         'create: package_relationship_create_rest',
         'delete: member_delete',
         'delete: package_relationship_delete_rest',

From 9f3bd90046436717dd8602d74e1395c5b43192c9 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Thu, 28 Nov 2013 10:35:29 +0000
Subject: [PATCH 06/10] [#1102] Changed labelling on remove and add buttons

---
 ckan/templates/group/snippets/group_item.html | 2 +-
 ckan/templates/package/group_list.html        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ckan/templates/group/snippets/group_item.html b/ckan/templates/group/snippets/group_item.html
index 0c035e44596..1ce5104a6bc 100644
--- a/ckan/templates/group/snippets/group_item.html
+++ b/ckan/templates/group/snippets/group_item.html
@@ -38,7 +38,7 @@ <h3 class="media-heading">{{ group.display_name }}</h3>
     <span>{{ _('View {name}').format(name=group.display_name) }}</span>
   </a>
   {% if group.user_member %}
-    <button name="group_removed" value="{{ group.id }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove this group from dataset') }}">{{ _('Remove') }}</button>
+    <button name="group_removed" value="{{ group.id }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove dataset from this group') }}">{{ _('Remove') }}</button>
   {% endif %}
 </li>
 {% if position is divisibleby 3 %}
diff --git a/ckan/templates/package/group_list.html b/ckan/templates/package/group_list.html
index 190c95a51cf..34b29496c11 100644
--- a/ckan/templates/package/group_list.html
+++ b/ckan/templates/package/group_list.html
@@ -6,13 +6,12 @@ <h2 class="hide-heading">{{ _('Groups') }}</h2>
 
   {% if c.group_dropdown %}
     <form method="post" class="form-horizontal">
-    {#'data-module': ''#}
       <select id="field-add_group" name="group_added" data-module="autocomplete">
         {% for option in c.group_dropdown %}
           <option value="{{ option[0] }}"> {{ option[1] }}</option>
         {% endfor %}
       </select>
-      <button type="submit" class="btn btn-primary" title="{{ _('Associate this group with this dataset') }}">{{ _('Add group') }}</button>
+      <button type="submit" class="btn btn-primary" title="{{ _('Associate this group with this dataset') }}">{{ _('Add to group') }}</button>
     </form>
   {% endif %}
 

From 09394b04f69147c58d11dc84a5d7f4e959f271f1 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Thu, 28 Nov 2013 10:36:12 +0000
Subject: [PATCH 07/10] [#1102] Typo fix

---
 ckan/controllers/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index 7feab9c2f95..6772125aea7 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -1299,7 +1299,7 @@ def groups(self, id):
 
         for group in c.pkg_dict.get('groups', []):
             ## this could be pushed back to package dictize
-            group['display_name'] = group.get('titile') or group.get('name')
+            group['display_name'] = group.get('title') or group.get('name')
             group['user_member'] = (group['id'] in user_group_ids)
 
 

From f075c6797076674b9c172ce974845427003f7594 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 28 Nov 2013 18:49:52 +0000
Subject: [PATCH 08/10] [#1102] make package_dictize go through
 group_list_dictize, except ignore package counts

---
 ckan/controllers/package.py           |  5 +---
 ckan/lib/dictization/model_dictize.py | 38 ++++++++++++++++-----------
 ckan/logic/schema.py                  |  1 +
 ckan/tests/lib/test_dictization.py    |  4 +++
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index a2ff70206b2..8f136cde269 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -1286,7 +1286,7 @@ def followers(self, id=None):
     def groups(self, id):
         context = {'model': model, 'session': model.Session,
                    'user': c.user or c.author, 'for_view': True,
-                   'auth_user_obj': c.userobj}
+                   'auth_user_obj': c.userobj, 'use_cache': False}
         data_dict = {'id': id}
         try:
             c.pkg_dict = get_action('package_show')(context, data_dict)
@@ -1335,11 +1335,8 @@ def groups(self, id):
                            group['id'] not in pkg_group_ids]
 
         for group in c.pkg_dict.get('groups', []):
-            ## this could be pushed back to package dictize
-            group['display_name'] = group.get('titile') or group.get('name')
             group['user_member'] = (group['id'] in user_group_ids)
 
-
         return render('package/group_list.html')
 
     def activity(self, id):
diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py
index 610aeaeb41e..fedfd90a8d3 100644
--- a/ckan/lib/dictization/model_dictize.py
+++ b/ckan/lib/dictization/model_dictize.py
@@ -15,18 +15,18 @@
 ## package save
 
 def group_list_dictize(obj_list, context,
-                       sort_key=lambda x:x['display_name'], reverse=False):
+                       sort_key=lambda x:x['display_name'], reverse=False,
+                       with_package_counts=True):
 
     active = context.get('active', True)
     with_private = context.get('include_private_packages', False)
 
-    query = search.PackageSearchQuery()
-
-    q = {'q': '+capacity:public' if not with_private else '*:*',
-         'fl': 'groups', 'facet.field': ['groups', 'owner_org'],
-         'facet.limit': -1, 'rows': 1}
-
-    query.run(q)
+    if with_package_counts:
+        query = search.PackageSearchQuery()
+        q = {'q': '+capacity:public' if not with_private else '*:*',
+             'fl': 'groups', 'facet.field': ['groups', 'owner_org'],
+             'facet.limit': -1, 'rows': 1}
+        query.run(q)
 
     result_list = []
 
@@ -40,7 +40,8 @@ def group_list_dictize(obj_list, context,
         if active and obj.state not in ('active', 'pending'):
             continue
 
-        group_dict['display_name'] = obj.display_name
+        group_dict['display_name'] = (group_dict.get('title') or
+                                      group_dict.get('name'))
 
         image_url = group_dict.get('image_url')
         group_dict['image_display_url'] = image_url
@@ -49,13 +50,16 @@ def group_list_dictize(obj_list, context,
             #of potential vulnerability of dodgy api input
             image_url = munge.munge_filename(image_url)
             group_dict['image_display_url'] = h.url_for_static(
-                'uploads/group/%s' % group_dict.get('image_url')
+                'uploads/group/%s' % group_dict.get('image_url'),
+                qualified=True
             )
 
-        if obj.is_organization:
-            group_dict['packages'] = query.facets['owner_org'].get(obj.id, 0)
-        else:
-            group_dict['packages'] = query.facets['groups'].get(obj.name, 0)
+        if with_package_counts:
+            facets = query.facets
+            if obj.is_organization:
+                group_dict['packages'] = facets['owner_org'].get(obj.id, 0)
+            else:
+                group_dict['packages'] = facets['groups'].get(obj.name, 0)
 
         if context.get('for_view'):
             if group_dict['is_organization']:
@@ -259,7 +263,11 @@ def package_dictize(pkg, context):
                 .where(member_rev.c.state == 'active') \
                 .where(group.c.is_organization == False)
     result = _execute_with_revision(q, member_rev, context)
-    result_dict["groups"] = d.obj_list_dictize(result, context)
+    context['with_capacity'] = False
+    ## no package counts as cannot fetch from search index at the same
+    ## time as indexing to it.
+    result_dict["groups"] = group_list_dictize(result, context,
+                                               with_package_counts=False)
     #owning organization
     group_rev = model.group_revision_table
     q = select([group_rev]
diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
index a54c243357a..c4910c8b6db 100644
--- a/ckan/logic/schema.py
+++ b/ckan/logic/schema.py
@@ -223,6 +223,7 @@ def default_show_package_schema():
 
     schema['groups'].update({
         'description': [ignore_missing],
+        'image_display_url': [ignore_missing],
         })
 
     # Remove validators for several keys from the schema so validation doesn't
diff --git a/ckan/tests/lib/test_dictization.py b/ckan/tests/lib/test_dictization.py
index a1a94fc2b21..de720731261 100644
--- a/ckan/tests/lib/test_dictization.py
+++ b/ckan/tests/lib/test_dictization.py
@@ -48,6 +48,8 @@ def setup_class(cls):
                         'name': u'david',
                         'capacity': 'public',
                         'image_url': u'',
+                        'image_display_url': u'',
+                        'display_name': u"Dave's books",
                         'type': u'group',
                         'state': u'active',
                         'is_organization': False,
@@ -57,6 +59,8 @@ def setup_class(cls):
                         'name': u'roger',
                         'capacity': 'public',
                         'image_url': u'',
+                        'image_display_url': u'',
+                        'display_name': u"Roger's books",
                         'type': u'group',
                         'state': u'active',
                         'is_organization': False,

From db01ffed2d5f8d63d26b5cf63fa7cf8737e3a37b Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Thu, 5 Dec 2013 16:31:16 +0000
Subject: [PATCH 09/10] [#1102] Don't display dataset count if packages
 property is not there

---
 ckan/templates/group/snippets/group_item.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/templates/group/snippets/group_item.html b/ckan/templates/group/snippets/group_item.html
index b3291630e0f..04351329f2b 100644
--- a/ckan/templates/group/snippets/group_item.html
+++ b/ckan/templates/group/snippets/group_item.html
@@ -30,7 +30,7 @@ <h3 class="media-heading">{{ group.display_name }}</h3>
   {% block datasets %}
     {% if group.packages %}
       <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', group.packages).format(num=group.packages) }}</strong>
-    {% else %}
+    {% elif group.packages == 0 %}
       <span class="count">{{ _('0 Datasets') }}</span>
     {% endif %}
   {% endblock %}

From 78fa009f07bf0a83a4c1056292681525c776aa69 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Thu, 5 Dec 2013 16:39:16 +0000
Subject: [PATCH 10/10] [#1102] Add display_name to schema so it shows on the
 Groups tab

---
 ckan/logic/schema.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
index c4910c8b6db..2f8457f709a 100644
--- a/ckan/logic/schema.py
+++ b/ckan/logic/schema.py
@@ -223,6 +223,7 @@ def default_show_package_schema():
 
     schema['groups'].update({
         'description': [ignore_missing],
+        'display_name': [ignore_missing],
         'image_display_url': [ignore_missing],
         })