Now, the language updates dynamically, and the route bug has been fixed. (OWASP-BLT#3823)

* solved

* Apply pre-commit fixes

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: igennova

website/templates/repo/repo_list.html

@@ -24,7 +24,7 @@ <h1 class="text-3xl font-bold text-gray-900">
                 <div class="inline-flex items-center pb-2 mb-2 border-b border-gray-200 w-full">
                     <span class="text-gray-700 font-semibold mr-4">Organizations:</span>
                     <div class="flex flex-wrap gap-2">
-                        <a href="{% url 'repo_list' %}{% if request.GET.q %}?q={{ request.GET.q }}{% endif %}{% if current_language %}&language={{ current_language }}{% endif %}"
+                        <a href="?{% if request.GET.q %}q={{ request.GET.q }}&{% endif %}{% if current_language %}language={{ current_language }}{% endif %}"
                            class="px-3 py-1 rounded-full {% if not current_organization %}bg-red-600 text-white{% else %}bg-gray-200 text-gray-700 hover:bg-gray-300{% endif %}">
                             All
                         </a>

website/views/repo.py

@@ -80,19 +80,6 @@ def get_context_data(self, **kwargs):
         # Get the filtered queryset count instead of all repos
         context["total_repos"] = self.get_queryset().count()
 
-        # Get language counts
-        language_counts = (
-            Repo.objects.exclude(primary_language__isnull=True)
-            .exclude(primary_language="")
-            .values("primary_language")
-            .annotate(count=Count("id"))
-            .order_by("-count")
-        )
-        context["languages"] = language_counts
-
-        # Get current language filter
-        context["current_language"] = self.request.GET.get("language")
-
         # Get organizations from related Organization model
         organizations = Organization.objects.filter(repos__isnull=False).distinct()
         context["organizations"] = organizations
@@ -108,6 +95,35 @@ def get_context_data(self, **kwargs):
             except Organization.DoesNotExist:
                 context["current_organization_name"] = None
 
+        # Get language counts based on current filters
+        queryset = Repo.objects.all()
+
+        # Apply organization filter if selected
+        if context["current_organization"]:
+            queryset = queryset.filter(organization__id=context["current_organization"])
+
+        # Apply search filter if present
+        search_query = self.request.GET.get("q")
+        if search_query:
+            queryset = queryset.filter(
+                Q(name__icontains=search_query)
+                | Q(description__icontains=search_query)
+                | Q(primary_language__icontains=search_query)
+            )
+
+        # Get language counts from filtered queryset
+        language_counts = (
+            queryset.exclude(primary_language__isnull=True)
+            .exclude(primary_language="")
+            .values("primary_language")
+            .annotate(count=Count("id"))
+            .order_by("-count")
+        )
+        context["languages"] = language_counts
+
+        # Get current language filter
+        context["current_language"] = self.request.GET.get("language")
+
         return context