Merge pull request DefectDojo#1820 from wichmannpas/fix-apply-template-tags

devGregA · web-flow · commit 0586282c0858 · 2020-02-04T12:58:38.000-06:00
Apply Template to Finding: Fix merge options for tags
diff --git a/dojo/finding/views.py b/dojo/finding/views.py
@@ -1353,6 +1353,7 @@ def choose_finding_template_options(request, tid, fid):
         'product_tab': product_tab,
         'template': template,
         'form': form,
+        'finding_tags': [tag.name for tag in finding.tags.all()],
     })
 
 
diff --git a/dojo/forms.py b/dojo/forms.py
@@ -1017,8 +1017,9 @@ class ApplyFindingTemplateForm(forms.Form):
                                      "Choose from the list or add new tags.  Press TAB key to add.")
 
     def __init__(self, template=None, *args, **kwargs):
-        tags = Tag.objects.usage_for_model(Finding_Template)
-        t = [(tag.name, tag.name) for tag in tags]
+        # django-tagging apparently can not filter for multiple models at once
+        tags = Tag.objects.usage_for_model(Finding_Template) + Tag.objects.usage_for_model(Finding)
+        t = sorted({(tag.name, tag.name) for tag in tags})
         super(ApplyFindingTemplateForm, self).__init__(*args, **kwargs)
         self.fields['tags'].widget.choices = t
         self.template = template
diff --git a/dojo/templates/dojo/apply_finding_template.html b/dojo/templates/dojo/apply_finding_template.html
@@ -80,6 +80,7 @@ <h3> Apply template to a Finding</h3>
                     ]
                 });
                 mde.render();
+                elem.mde = mde;
             });
         });
 
diff --git a/dojo/templates/dojo/apply_finding_template_form_fields.html b/dojo/templates/dojo/apply_finding_template_form_fields.html
@@ -1,3 +1,4 @@
+{% load as_json %}
 {% load event_tags %}
 {% load get_attribute %}
 {% if form.non_field_errors %}
@@ -21,10 +22,14 @@
     <div class="form-group{% if field.errors %} has-error{% endif %}">
         <label class="col-sm-2 control-label">{{ field.label }} Option</label>
         <div class="col-sm-10 {{ classes.value }}">
-            <select class="form-control" data-field-value="{{ field.value }}" data-template-value="{{ template_value }}" onchange="(function(t){ var fieldValue = ''; switch(t.value.toLowerCase()){ case 'keep': fieldValue=t.getAttribute('data-field-value'); break; case 'replace': fieldValue= t.getAttribute('data-template-value'); break; case 'combine': fieldValue= t.getAttribute('data-field-value').concat('\r\n').concat(t.getAttribute('data-template-value')); break;  } document.forms['apply_template']['{{ field.name }}'].value = fieldValue; })(this)">
+            {% if field.name == 'tags' %}
+                <select class="form-control" data-field-value="{{ finding_tags|as_json }}" data-template-value="{{ field.value|as_json }}" onchange="(function(t){ var field = document.forms['apply_template']['{{ field.name }}']; var fieldValue = ''; switch(t.value.toLowerCase()){ case 'keep': fieldValue=JSON.parse(t.getAttribute('data-field-value')); break; case 'replace': fieldValue= JSON.parse(t.getAttribute('data-template-value')); break; case 'combine': fieldValue= JSON.parse(t.getAttribute('data-field-value')).concat(JSON.parse(t.getAttribute('data-template-value'))); break;  } $(field).val(fieldValue); $('#id_tags').trigger('chosen:updated'); })(this)">
+            {% else %}
+                <select class="form-control" data-field-value="{{ field.value }}" data-template-value="{{ template_value }}" onchange="(function(t){ var field = document.forms['apply_template']['{{ field.name }}']; var fieldValue = ''; switch(t.value.toLowerCase()){ case 'keep': fieldValue=t.getAttribute('data-field-value'); break; case 'replace': fieldValue= t.getAttribute('data-template-value'); break; case 'combine': fieldValue= t.getAttribute('data-field-value').concat('\r\n').concat(t.getAttribute('data-template-value')); break;  } field.mde === undefined ? field.value = fieldValue : field.mde.value(fieldValue); })(this)">
+            {% endif %}
                 <option value="Keep">Keep</option>
                 <option value="Replace">Replace</option>
-                {% if field|is_text %}
+                {% if field|is_text or field.name == 'tags' %}
                     <option value="Combine">Combine</option>
                 {% endif %}
             </select>
diff --git a/dojo/templatetags/as_json.py b/dojo/templatetags/as_json.py
@@ -0,0 +1,8 @@
+import json
+from django import template
+register = template.Library()
+
+
+@register.filter
+def as_json(value):
+    return json.dumps(value)

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ <h3> Apply template to a Finding</h3>`
`80`	`80`	`]`
`81`	`81`	`});`
`82`	`82`	`mde.render();`
	`83`	`+ elem.mde = mde;`
`83`	`84`	`});`
`84`	`85`	`});`
`85`	`86`