Merge pull request #4578 from GeoNode/ISSUE_4575

[Fixes #4575] Group Category summary page does not show associated gr…
GeoNode · Jun 26, 2019 · f4df6cb · f4df6cb
2 parents ea25a79 + 0ea2149
commit f4df6cb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/geonode/groups/templates/groups/_group_profile_list_item.html b/geonode/groups/templates/groups/_group_profile_list_item.html
@@ -0,0 +1,30 @@
+{% verbatim %}
+<article ng-repeat="group in results" ng-cloak class="ng-cloak">
+  <div class="col-xs-12 col-sm-6 col-lg-4 group-container">
+    <div class="col-xs-12 group-avatar">
+      <div class="col-xs-4 group-image">
+        <a ng-if="group.group_profile.logo" href="{{ group.group_profile.detail_url }}" ><img ng-if="group.group_profile.logo" ng-src="{{ group.group_profile.logo }}" alt="{{ group.group_profile.title }}" class="group-logo" /></a>
+      </div>
+      <div class="col-xs-8 group-details">
+        <h5><a href="{{ group.group_profile.detail_url }}"></a></h5>
+        <!-- <a href="mailto:{{ group.group_profile.email }}" ng-if="group.group_profile.email != ''"><i class="fa fa-envelope-o"></i></a> -->
+        <p><small>{{ group.group_profile.description | limitTo: 100 }}{{ group.group_profile.description.length  > 100 ? '...' : ''}}</small></p>
+      </div>
+      <div class="col-xs-12 group-items">
+        <ul class="list-inline">
+          <li>
+        <a href="{{ group.group_profile.detail_url }}">
+          <strong>{{ group.group_profile.member_count }}</strong>
+          <ng-pluralize count="group.group_profile.member_count" when="{'1': 'Member', 'other': 'Members'}"></ng-pluralize>
+        </a>
+      </li>
+      <li>
+        <a href="{{ group.group_profile.detail_url }}">
+          <strong>{{ group.group_profile.manager_count }}</strong>
+          <ng-pluralize count="group.group_profile.manager_count" when="{'1': 'Manager', 'other': 'Managers'}"></ng-pluralize>
+        </a>
+      </li>
+    </div>
+  </div>
+</article>
+{% endverbatim %}
diff --git a/geonode/groups/templates/groups/groupcategory_detail.html b/geonode/groups/templates/groups/groupcategory_detail.html
@@ -20,7 +20,7 @@ <h2 class="page-title">{{ object.name|default:object.slug }}</h2>
 
   <div class="col-md-4">
     <ul class="list-group">
-      {% if request.user.is_staff %}
+      {% if request.user.is_staff or request.user.is_superuser %}
       <li class="list-group-item"><a href="{% url "group_category_update" object.slug %}">{% trans "Edit Group Category Details" %}</a></li>
       {% endif %}
     </ul>
@@ -30,7 +30,7 @@ <h2 class="page-title">{{ object.name|default:object.slug }}</h2>
   <div class="col-md-12">
     <h4>{% trans "Groups" %}</h4>
     <div class="tab-content paginate paginate-auto" id="search-content">
-    {% include 'groups/_group_list_item.html' %}
+    {% include 'groups/_group_profile_list_item.html' %}
     </div>
   </div>
   {% include 'search/_pagination.html' %}