[#2939] Fixes for solr indexing

ckan/lib/search/index.py

@@ -145,16 +145,16 @@ def index_package(self, pkg_dict, defer_commit=False):
         # add groups
         groups = pkg_dict.pop('groups', [])
 
-        # Capacity is different to the default only if using organizations
-        # where the dataset is only in one group. We will add the capacity
-        # from the single group that it is a part of if we have a group
-        if len(groups):
-            pkg_dict['capacity'] = groups[0].get('capacity', 'public')
-        else:
-            pkg_dict['capacity'] = 'public'
+        pkg_dict['capacity'] = 'public'
 
         pkg_dict['groups'] = [group['name'] for group in groups]
 
+        # if there is an owner_org we want to add this to groups for index
+        # purposes
+        if pkg_dict['owner_org']:
+            pkg_dict['groups'].append(pkg_dict['organization']['name'])
+
+
         # tracking
         tracking_summary = pkg_dict.pop('tracking_summary', None)
         if tracking_summary: