Merge pull request #5248 from DefectDojo/release/2.3.1

Release: Merge release into master from: release/2.3.1

Author: Maffooch

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "DefectDojo",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "dependencies": {
     "JUMFlot": "jumjum123/JUMFlot#*",
     "bootstrap": "^3.4.0",

dojo/__init__.py

@@ -6,6 +6,6 @@
 
 default_app_config = 'dojo.apps.DojoAppConfig'
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://defectdojo.github.io/django-DefectDojo'

dojo/templates/base.html

@@ -795,8 +795,9 @@ <h3 class="no-margin-top" style="padding-bottom: 5px;">
 
         $('select').not('#notification-scope').addClass('selectpicker');
         $('.selectpicker').attr('data-live-search', 'true');
+        $('.selectpicker').attr('data-container', 'body');
         $('.selectpicker').css('width', '70%');
-        $('.selectpicker').selectpicker();
+        $('.selectpicker').selectpicker('render');
 
     });
 </script>

dojo/templates/dojo/findings_list_snippet.html

@@ -71,7 +71,7 @@ <h3 class="has-filters">
                     </button>
                     {% endif %}
                 </div>
-                <ul class="dropdown-menu" style="overflow: hidden;" aria-labelledby="dropdownMenu1" id="bulk_edit">
+                <ul class="dropdown-menu" aria-labelledby="dropdownMenu1" id="bulk_edit">
                     <li class="dropdown-header">Choose wisely...</li>
                     <li style="padding-left: 8px;">
                         {% if product_tab %}
@@ -82,7 +82,7 @@ <h3 class="has-filters">
                             {% csrf_token %}
                             <input type="hidden" name="return_url" value="{{ request.get_full_path }}" />
                             <label style="display: block" for="severity">Severity</label>
-                            <select name="severity" data-container="body" id="severity" style="font-size: 80%">
+                            <select name="severity" id="severity" style="font-size: 80%">
                                 <option value="">Choose...</option>
                                 <option value="Info">Info</option>
                                 <option value="Low">Low</option>

dojo/templates/dojo/snippets/selectpicker_in_dropdown.html

@@ -1,23 +1,39 @@
 {% load static %}
 <script type="application/javascript">
-    $('.dropdown-menu').on('click', function(event) {
-        event.stopPropagation();
-    });
-
-
     $('.selectpicker').selectpicker({
         container: 'body'
     });
+    
+    $('.dropdown-menu').on('click', function(event) {
+        var target = $(event.target);
+        var bs_select_parent = target.parents('.bootstrap-select')
+        if (bs_select_parent.length) {
+            var hasClass = bs_select_parent.hasClass('open');
+            if (hasClass) {
+                bs_select_parent.removeClass('open');
+            } else {
+                bs_select_parent.addClass('open');
+            }  
+        } 
+        event.stopPropagation()
+    });
 
     $('body').on('click', function(event) {
         var target = $(event.target);
-        if (target.parents('.bootstrap-select').length) {
-            event.stopPropagation();
-            $('.bootstrap-select.open').removeClass('open');
-        }
-        var hasClass = $('.bs-container').hasClass('open');
-        if (hasClass) {
-            $('.bs-container').removeClass('open');
+        var selected = target[0].id.indexOf('bs-select')
+        var bs_select_parent = target.parents('.bootstrap-select')
+        if (selected == -1 && bs_select_parent.length) {
+
+            var hasClass = bs_select_parent.hasClass('open');
+            if (hasClass) {
+                bs_select_parent.removeClass('open');
+            } else {
+                bs_select_parent.addClass('open');
+            }
+        } 
+        var hasClass = bs_select_parent.hasClass('open');
+        if (selected == -1 && hasClass) {
+            bs_select_parent.removeClass('open');
         }
-    });	
+    });	    
 </script>

dojo/templates/dojo/view_test.html

@@ -547,14 +547,14 @@ <h4 class="has-filters"> Findings ({{findings.total_count}}) <small>{{ test.id|g
                     </button>
                 {% endif %}
             </div>
-            <ul class="dropdown-menu" style="overflow: hidden;" aria-labelledby="dropdownMenu1" id="bulk_edit">
+            <ul class="dropdown-menu" aria-labelledby="dropdownMenu1" id="bulk_edit">
                 <li class="dropdown-header">Choose wisely...</li>
                 <li style="padding-left: 8px;padding-right: 8px;">
                     <form action="{% url 'finding_bulk_update_all_product' product_tab.product.id %}" method="post" id="bulk_change_form">
                         {% csrf_token %}
                         <input type="hidden" name="return_url" value="{{ request.get_full_path }}" />
                         <label style="display: block" for="severity">Severity</label>
-                        <select name="severity" data-container="body" id="severity" style="font-size: 80%">
+                        <select name="severity" id="severity" style="font-size: 80%">
                             <option value="">Choose...</option>
                             <option value="Info">Info</option>
                             <option value="Low">Low</option>

helm/defectdojo/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "2.3.0"
+appVersion: "2.3.1"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
 version: 1.6.15