Fix tags modal

qgis-app/models/templatetags/resources_tagcloud.py

@@ -68,17 +68,27 @@ def get_resources_tagcloud(context, app_label, model):
 
     return queryset
 
-@register.inclusion_tag("base/includes/resources_tagcloud_modal_include.html", takes_context=True)
-def include_resources_tagcloud_modal(context, app_label, model):
-    tags = get_resources_tagcloud(context, app_label, model)
+def get_tags_title(model):
     tags_title = model[0].upper() + model[1:]
-    if str(model).lower() == "wavefront":
+    if model.lower() == "wavefront":
         tags_title = "3D Model"
-    elif str(model).lower() == "layerdefinition":
+    elif model.lower() == "layerdefinition":
         tags_title = "Layer Definition"
+    return tags_title + " Tags"
 
+@register.inclusion_tag("base/includes/resources_tagcloud_modal_include.html", takes_context=True)
+def include_resources_tagcloud_modal(context, app_label, model):
+    tags_title = get_tags_title(model)
+    return {
+        'tags_title': tags_title
+    }
+
+@register.inclusion_tag("base/includes/resources_tags_modal.html", takes_context=True)
+def include_resources_tags_modal(context, app_label, model):
+    tags = get_resources_tagcloud(context, app_label, model)
+    tags_title = get_tags_title(model)
     return {
         'tags': tags, 
-        'tags_title': tags_title + " Tags",
+        'tags_title': tags_title,
         'tags_list_url': model + "_tag"
     }

qgis-app/templates/base.html

@@ -67,6 +67,8 @@
     {% get_sustaining_members_section as sustaining_members_section %}
     {{ sustaining_members_section|safe }}
     {% include 'layouts/footer.html' %}
+
+    {% include 'base/includes/resources_tags_modal.html' %}
 
 <script type="text/javascript" src="{% static 'js/moment.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/local_timezone-1.0.js' %}"></script>

qgis-app/templates/base/includes/resources_tagcloud_modal_include.html

@@ -4,6 +4,3 @@
   </span>
   {{ tags_title }} 
 </a>
-
-
-{% include 'base/includes/resources_tags_modal.html' %}

qgis-app/templates/base/list_galery.html

@@ -1,4 +1,4 @@
-{% extends 'base/base.html' %}{% load i18n bootstrap_pagination humanize static thumbnail resources_custom_tags %}
+{% extends 'base/base.html' %}{% load i18n bootstrap_pagination humanize static thumbnail resources_custom_tags resources_tagcloud %}
 
 {% block extrajs %}
 {{ block.super }}
@@ -52,6 +52,7 @@
 {% endblock %}
 
 {% block content %}
+  {% include_resources_tags_modal app_label=app_label model=model_name %}
   <h2 class="title is-4">{% if title %}{{title}}{% else %}{% trans "All" %} {{ resource_name }}s{% endif %}</h2>
 
 	<div class="container rich tips mb-3">