CONCD-996 'All' option in the Campaign status dropdown to allow users…

… to get back to that option after selecting others.
LibraryOfCongress · Jan 7, 2025 · 4c01b3f · 4c01b3f
1 parent 181339b
commit 4c01b3f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/concordia/templates/transcriptions/campaign_list_small_blocks.html b/concordia/templates/transcriptions/campaign_list_small_blocks.html
@@ -27,7 +27,8 @@ <h1>Completed Campaigns</h1>
             <div class="d-flex align-items-center ms-3 mt-2">
                 <label for="campaign-type" class="pe-1">Campaign Status</label>
                 <select id="campaign-type">
-                    <option value="completed"{% if request.GET.type != 'retired' %} selected{% endif %}>Completed</option>
+                    <option value="all"{% if 'type' not in request.GET %} selected{%endif %}>All</option>
+                    <option value="completed"{% if request.GET.type == 'completed' %} selected{% endif %}>Completed</option>
                     <option value="retired"{% if request.GET.type == 'retired' %} selected{% endif %}>Retired</option>
                 </select>
                 <a class="btn btn-primary" onclick="toggleCampaignType();" type="submit">Go</a>
@@ -125,7 +126,11 @@ <h1>Completed Campaigns</h1>
         var toggleCampaignType = function(form) {
             let url = new URL(window.location.href);
             let typeValue = document.getElementById('campaign-type').value;
-            url.searchParams.set("type", encodeURIComponent(typeValue));
+            if (typeValue == "all") {
+                url.searchParams.delete("type");
+            } else {
+                url.searchParams.set("type", encodeURIComponent(typeValue));
+            }
             window.location.href = url;
         }
 

diff --git a/concordia/views.py b/concordia/views.py
@@ -912,11 +912,16 @@ class CompletedCampaignListView(APIListView):
     template_name = "transcriptions/campaign_list_small_blocks.html"
 
     def _get_all_campaigns(self):
-        if self.request.GET.get("type", "completed") == "retired":
+        campaignType = self.request.GET.get("type", None)
+        campaigns = Campaign.objects.published().listed()
+        if campaignType is None:
+            return campaigns
+        elif campaignType == "retired":
             status = Campaign.Status.RETIRED
         else:
             status = Campaign.Status.COMPLETED
-        return Campaign.objects.published().listed().filter(status=status)
+
+        return campaigns.filter(status=status)
 
     def get_queryset(self):
         campaigns = self._get_all_campaigns()