[2255] Only search for public datasets on /dataset/ and only show pri…

…vate on /organization/ if current user is a member

ckan/controllers/group.py

@@ -154,8 +154,14 @@ def pager_url(q=None, page=None):
                     else:
                         search_extras[param] = value
 
+
+            fq = 'capacity:"public"'
+            if (c.userobj and c.group and c.userobj.is_in_group(c.group)):
+                fq = ''
+
             data_dict = {
                 'q':q,
+                'fq':fq,
                 'facet.field':g.facets,
                 'rows':limit,
                 'start':(page-1)*limit,

ckan/controllers/package.py

@@ -161,6 +161,7 @@ def pager_url(q=None, page=None):
                     else:
                         search_extras[param] = value
 
+            fq += ' capacity:"public"'
             context = {'model': model, 'session': model.Session,
                        'user': c.user or c.author, 'for_view': True}
 

ckanext/organizations/templates/organization_layout.html

@@ -7,7 +7,10 @@
   >
   <?python
     import ckan.model as model
-    editors = c.group.members_of_type(model.User, 'editor')
+    if isinstance(c.group, model.Group):
+        editors = c.group.members_of_type(model.User, 'editor')
+    else:
+        editors = []
   ?>
   <py:match path="minornavigation">
     <ul class="nav nav-pills" py:choose="bool(c.group)">