update view_finding, view_test templates and display_tags to look at import_settings locations

Author: dogboat

dojo/templates/dojo/view_finding.html

@@ -880,7 +880,12 @@ <h4 class="has-filters">
                                         {{ test_import_finding_action.test_import.version|default_if_none:"" }}
                                     </td>
                                     <td>
-                                        {{ test_import_finding_action.test_import.import_settings.endpoint|default_if_none:"" }}
+                                        {% if V3_FEATURE_LOCATIONS %}
+                                            {{ test_import_finding_action.test_import.import_settings.locations|default_if_none:"" }}
+                                        {% else %}
+                                            {% comment %} TODO: Delete this after the move to Locations {% endcomment %}
+                                            {{ test_import_finding_action.test_import.import_settings.endpoint|default_if_none:"" }}
+                                        {% endif %}
                                     </td>
 
                                 </tr>

dojo/templates/dojo/view_test.html

@@ -271,7 +271,12 @@ <h4 class="has-filters">
                                         {{ test_import.version|default_if_none:"" }}
                                     </td>
                                     <td>
-                                        {{ test_import.import_settings.endpoint|default_if_none:"" }}
+                                        {% if V3_FEATURE_LOCATIONS %}
+                                            {{ test_import.import_settings.locations|default_if_none:"" }}
+                                        {% else %}
+                                            {% comment %} TODO: Delete this after the move to Locations {% endcomment %}
+                                            {{ test_import.import_settings.endpoint|default_if_none:"" }}
+                                        {% endif %}
                                     </td>
                                     <td>
                                         {% regroup test_import.test_import_finding_action_set.all by get_action_display as finding_action_list %}

dojo/templatetags/display_tags.py

@@ -1088,15 +1088,26 @@ def esc(x):
     icon = "fa-info-circle"
     color = ""
 
+    if not settings.V3_FEATURE_LOCATIONS:
+        # TODO: Delete this after the move to Locations
+        return mark_safe(html % (icon, color, icon,
+                                    esc(test_import.id),
+                                    esc(test_import.import_settings.get("active", None)),
+                                    esc(test_import.import_settings.get("verified", None)),
+                                    esc(test_import.import_settings.get("minimum_severity", None)),
+                                    esc(test_import.import_settings.get("close_old_findings", None)),
+                                    esc(test_import.import_settings.get("push_to_jira", None)),
+                                    esc(test_import.import_settings.get("tags", None)),
+                                    esc(test_import.import_settings.get("endpoints", test_import.import_settings.get("endpoint", None)))))
     return mark_safe(html % (icon, color, icon,
-                                esc(test_import.id),
-                                esc(test_import.import_settings.get("active", None)),
-                                esc(test_import.import_settings.get("verified", None)),
-                                esc(test_import.import_settings.get("minimum_severity", None)),
-                                esc(test_import.import_settings.get("close_old_findings", None)),
-                                esc(test_import.import_settings.get("push_to_jira", None)),
-                                esc(test_import.import_settings.get("tags", None)),
-                                esc(test_import.import_settings.get("endpoints", test_import.import_settings.get("endpoint", None)))))
+                             esc(test_import.id),
+                             esc(test_import.import_settings.get("active", None)),
+                             esc(test_import.import_settings.get("verified", None)),
+                             esc(test_import.import_settings.get("minimum_severity", None)),
+                             esc(test_import.import_settings.get("close_old_findings", None)),
+                             esc(test_import.import_settings.get("push_to_jira", None)),
+                             esc(test_import.import_settings.get("tags", None)),
+                             esc(test_import.import_settings.get("locations", None))))
 
 
 @register.filter(needs_autoescape=True)