Merge origin/master

Author: vertigo17

source/src/main/java/org/cerberus/core/apiprivate/CampaignExecutionPrivateController.java

@@ -153,7 +153,7 @@ public ResponseEntity<String> getTagStatistics(
                     }
                 }
             }
-            response.put("globalGroup1List", campaignGroups1);
+            response.put("group1List", new HashSet<>(campaignGroups1.values())); //Hashset has only unique values
             response.put("campaignStatistics", aggregateListByCampaign);
             return ResponseEntity.ok(response.toString());
         } catch (JSONException exception) {

source/src/main/java/org/cerberus/core/servlet/crud/test/UpdateTestCaseWithDependencies.java

@@ -245,14 +245,7 @@ private List<TestCaseCountryProperties> getTestCaseCountryPropertiesFromParamete
             if (propJson.has("value3")) {
                 value3 = propJson.getString("value3");
             }
-
-            String length = "";
-            if (propJson.get("length") instanceof Number) { //Default value at property creation is integer with value 0.
-                length = String.valueOf(propJson.getInt("length"));
-            } else if (propJson.get("length") instanceof String) {
-                length = propJson.getString("length");
-            }
-
+            String length = propJson.getString("length");
             int rowLimit = propJson.getInt("rowLimit");
             int retryNb = propJson.optInt("retryNb");
             int retryPeriod = propJson.optInt("retryPeriod");

source/src/main/webapp/js/pages/ReportingCampaignStatistics.js

@@ -249,7 +249,7 @@ function getStatistics() {
             updateDatatable($("#tagStatisticTable"), data);
             removeLoadingStatus($("#tagStatisticList"));
             $('#group1Select').prop('disabled', false);
-            setSelectOptions("#group1Select", data.globalGroup1List);
+            setSelectOptions("#group1Select", data.group1List);
         }
     });
 }