Pull request #294: Development

Merge in ITB/itb-commons from development to master

* commit '511b1bb6afd443a618e70ddca5247de6396535aa':
  Upgraded ODC plugin to v12.0.1
  Unable to switch back to the detailed report once the aggregated report is selected

pom.xml

@@ -85,7 +85,7 @@
         <!-- Plugin versions -->
         <version.plugin.mavenCompilerPlugin>3.11.0</version.plugin.mavenCompilerPlugin>
         <version.plugin.mavenJarPlugin>3.3.0</version.plugin.mavenJarPlugin>
-        <version.plugin.dependencyCheckPlugin>12.0.0</version.plugin.dependencyCheckPlugin>
+        <version.plugin.dependencyCheckPlugin>12.0.1</version.plugin.dependencyCheckPlugin>
         <version.plugin.frontendMavenPlugin>1.12.1</version.plugin.frontendMavenPlugin>
         <version.plugin.jacocoMavenPlugin>0.8.10</version.plugin.jacocoMavenPlugin>
         <version.plugin.versionsMavenPlugin>2.16.0</version.plugin.versionsMavenPlugin>

validation-commons-web/src/main/resources/resources/js/itb-upload.js

@@ -1192,7 +1192,7 @@ function localeChanged() {
 }
 
 function reportTypeChange(aggregate) {
-    if (aggregate) {
+    if (aggregate == "true") {
         $('#reportItemsAggregated').removeClass('hidden');
         $('#reportItemsDetailed').addClass('hidden');
         $('#reportTypeSelectText').text($('#reportTypeSelectAggregatedText').text());