Fixed sidebar links so that you can now click on all of the meta-data lists

Author: apavlo

dbdb/core/search_indexes.py

@@ -30,6 +30,7 @@ class SystemVersionIndex(indexes.SearchIndex, indexes.Indexable):
     inspired_by = indexes.MultiValueField()
     oses = indexes.MultiValueField()
     written_langs = indexes.MultiValueField()
+    supported_langs = indexes.MultiValueField()
     project_types = indexes.MultiValueField()
     licenses = indexes.MultiValueField()
 
@@ -113,6 +114,17 @@ def prepare_written_langs(self, obj):
         ]
 
         return values
+    
+    def prepare_supported_langs(self, obj):
+        if obj.meta_id is None:
+            return []
+
+        values = [
+            pk
+            for pk in obj.meta.supported_languages.values_list('slug', flat=True)
+        ]
+
+        return values
 
     def prepare_project_types(self, obj):
         values = list(

dbdb/core/views.py

@@ -518,6 +518,7 @@ def do_search(self, request):
         search_inspired = request.GET.getlist('inspired')
         search_os = request.GET.getlist('os')
         search_programming = request.GET.getlist('programming')
+        search_supported = request.GET.getlist('supported')
         search_type = request.GET.getlist('type')
         search_license = request.GET.getlist('license')
         search_suffix = request.GET.getlist('suffix')
@@ -538,6 +539,7 @@ def do_search(self, request):
             'inspired': search_inspired,
             'os': search_os,
             'programming': search_programming,
+            'supported': search_supported,
             'type': search_type,
             'license': search_license,
             'suffix': search_suffix,
@@ -619,6 +621,13 @@ def do_search(self, request):
             langs = ProgrammingLanguage.objects.filter(slug__in=search_programming)
             search_tags.extend( SearchTag(request.GET, 'programming', 'Programming Languages', lang.slug, lang.name) for lang in langs )
             pass
+        
+        # search - supported languages
+        if search_supported:
+            sqs = sqs.filter(supported_langs__in=search_supported)
+            langs = ProgrammingLanguage.objects.filter(slug__in=search_supported)
+            search_tags.extend( SearchTag(request.GET, 'supported', 'Supported Languages', lang.slug, lang.name) for lang in langs )
+            pass
 
         # search - project types
         if search_type:
@@ -1478,7 +1487,7 @@ def get(self, request, stats_type=None):
             all_values = ProgrammingLanguage.objects.all()
             labels = dict(all_values.values_list('id', 'name'))
             slugs = dict(all_values.values_list('id', 'slug'))
-            stats.append( self.get_by_field('Programming Lang.', 'written_in', 'programming', labels, slugs, False, limit) )
+            stats.append( self.get_by_field('Implementation', 'written_in', 'programming', labels, slugs, False, limit) )
 
         all_values = System.objects.all()
         labels = dict(all_values.values_list('id', 'name'))

templates/core/system_base.html

@@ -260,18 +260,23 @@ <h6 class="card-title">
 
                 {% if system_version.project_types.exists %}
                     <h6 class="card-title">Project Type</h6>
-                    <p class="card-text">{{ system_version.project_types_str }}</p>
+                    <p class="card-text">
+                        {% for project_type in system_version.project_types.all %}{% if not forloop.first %}, {% endif %}<a class="card-title" href="{% url 'browse' %}?type={{ project_type.slug }}" title="View other {{ project_type.name }} systems">{{ project_type.name }}</a>{% endfor %}
+                    </p>
                 {% endif %}
 
                 {% if system_version.meta.written_in.exists %}
                     <h6 class="card-title">Written in</h6>
                     <p class="card-text">
                         {% for written_in in system_version.meta.written_in.all %}{% if not forloop.first %}, {% endif %}<a class="card-title" href="{% url 'browse' %}?programming={{ written_in.slug }}" title="View other systems that are written in {{ written_in.name }}">{{ written_in.name }}</a>{% endfor %}
+                    </p>
                 {% endif %}
 
                 {% if system_version.meta.supported_languages.exists %}
                     <h6 class="card-title">Supported languages</h6>
-                    <p class="card-text">{{ system_version.meta.supported_languages_str }}</p>
+                    <p class="card-text">
+                    {% for lang in system_version.meta.supported_languages.all %}{% if not forloop.first %}, {% endif %}<a class="card-title" href="{% url 'browse' %}?supported={{ lang.slug }}" title="View other systems that support {{ lang.name }}">{{ lang.name }}</a>{% endfor %}
+                    </p>
                 {% endif %}
 
                 {% if system_version.meta.derived_from.exists %}
@@ -304,7 +309,9 @@ <h6 class="card-title">Compatible With</h6>
 
                 {% if system_version.meta.oses.exists %}
                     <h6 class="card-title">Operating Systems</h6>
-                    <p class="card-text">{{ system_version.meta.oses_str }}</p>
+                    <p class="card-text">
+                        {% for os in system_version.meta.oses.all %}{% if not forloop.first %}, {% endif %}<a class="card-title" href="{% url 'browse' %}?os={{ os.slug }}" title="View other systems that support {{ os.name }} systems">{{ os.name }}</a>{% endfor %}
+                    </p>
                 {% endif %}
 
                 {% if system_version.meta.licenses.exists %}