Upated registry queries to fetch member communities

localcontexts · Oct 14, 2024 · 1beae71 · 1beae71
1 parent f98332c
commit 1beae71
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/accounts/views.py b/accounts/views.py
@@ -633,7 +633,7 @@ def registry(request, filtertype=None):
             if filtertype == "community-all":
                 cards = c
             elif filtertype == "community-members":
-                cards = c.filter(is_approved=True)
+                cards = c.filter(is_member=True)
             elif filtertype == "institution-all":
                 cards = i
             elif filtertype == "institution-subscribed":

diff --git a/localcontexts/admin.py b/localcontexts/admin.py
@@ -1499,7 +1499,7 @@ class BCLabelAdmin(admin.ModelAdmin):
 class CommunityAdmin(admin.ModelAdmin):
     form = CommunityModelForm
     list_display = (
-        'community_name', 'community_creator', 'contact_name', 'contact_email', 'is_approved',
+        'community_name', 'community_creator', 'contact_name', 'contact_email', 'is_member',
         'created', 'country'
     )
     search_fields = (

diff --git a/templates/partials/infocards/_community-card.html b/templates/partials/infocards/_community-card.html
@@ -15,8 +15,8 @@
         <div class="flex-this column w-50">
             <div class="subscribed-icon-wrapper">
                 <h3 class="dashcard-h3 darkteal-text">{{ community.community_name }}</h3>
-                {% if community.is_approved %}
-                    <i class="fa-sharp fa-solid fa-circle-check subscribed-icon fa-lg" title="Active"></i>
+                {% if community.is_member %}
+                    <i class="fa-sharp fa-solid fa-circle-check subscribed-icon fa-lg" title="Member"></i>
                 {% endif %}
             </div>
             <div>

diff --git a/templates/public.html b/templates/public.html
@@ -38,7 +38,7 @@
                             {% join_request_comm community.id request.user as request_exists %}
                             {% if request_exists or community in user_communities %}
                                 <div class="primary-btn disabled-btn">Request sent <i class="fa fa-check" aria-hidden="true"></i></div>
-                            {% else %}
+                            {% elif community.is_member %}
                                 <div class="mt-8 mb-8">
                                     <a id="openRequestToJoinModalBtn" class="default-a">Request to join</a>
                                 </div>
@@ -92,7 +92,7 @@
             <div class="flex-this column dashcard-text-container">
                 <div class="subscribed-icon-wrapper">
                     <h3 class="dashcard-h3">{{ community }}</h3>
-                    {% if community and community.is_approved %}
+                    {% if community and community.is_member %}
                         <i class="fa-sharp fa-solid fa-circle-check subscribed-icon fa-lg" title="Active"></i>
                     {% endif %}
                 </div>