App version dropdown list is not populated in the Pipeline syntax view

jenkinsci · Nov 28, 2023 · b76cb28 · b76cb28
1 parent d17ea65
commit b76cb28
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/com/fortify/plugin/jenkins/steps/types/JavaScanType.java b/src/main/java/com/fortify/plugin/jenkins/steps/types/JavaScanType.java
@@ -100,7 +100,7 @@ public ListBoxModel doFillJavaVersionItems(@QueryParameter String javaVersion) {
 			items.add("17", "17");
 
 			if ((null == javaVersion) || (0 == javaVersion.length())) {
-				items.get(3).selected = true; // default to Java 8
+				items.get(6).selected = true; // default to Java 11
 			}
 
 			return items;

diff --git a/src/main/resources/com/fortify/plugin/jenkins/FortifyPlugin/global.jelly b/src/main/resources/com/fortify/plugin/jenkins/FortifyPlugin/global.jelly
@@ -39,6 +39,7 @@
       </f:entry>
 
       <f:entry title="Issue template" help="/plugin/fortify/help-sscProjTemplate.html">
+        <script type="text/javascript" src="${rootURL}/plugin/fortify/purify.min.js"/>
         <script type="text/javascript" src="${rootURL}/plugin/fortify/refresh-projects.js"/>
         <div style="float:left;width:80%;">
           <f:editableComboBox id="projectTemplate" name="projectTemplate" field="projectTemplate" clazz="setting-input" items="${descriptor.projectTemplateItems}" checkMethod="post"/>

diff --git a/src/main/resources/com/fortify/plugin/jenkins/steps/CloudScanMbs/config.jelly b/src/main/resources/com/fortify/plugin/jenkins/steps/CloudScanMbs/config.jelly
@@ -67,6 +67,7 @@
             <f:optionalBlock field="uploadSSC"
                              title="Upload Fortify SCA scan results to Fortify Software Security Center">
                 <f:entry title="Application name" help="/plugin/fortify/help-remoteSscAppName.html">
+                    <script type="text/javascript" src="${rootURL}/plugin/fortify/purify.min.js"/>
                     <script type="text/javascript" src="${rootURL}/plugin/fortify/refresh-projects.js"/>
                     <div style="float:left;width:80%;">
                         <f:editableComboBox id="projectName" field="appName"

diff --git a/src/main/resources/com/fortify/plugin/jenkins/steps/CloudScanStart/config.jelly b/src/main/resources/com/fortify/plugin/jenkins/steps/CloudScanStart/config.jelly
@@ -61,6 +61,7 @@
             <f:optionalBlock field="uploadSSC"
                              title="Upload Fortify SCA scan results to Fortify Software Security Center">
                 <f:entry title="Application name" help="/plugin/fortify/help-remoteSscAppName.html">
+                    <script type="text/javascript" src="${rootURL}/plugin/fortify/purify.min.js"/>
                     <script type="text/javascript" src="${rootURL}/plugin/fortify/refresh-projects.js"/>
                     <div style="float:left;width:80%;">
                         <f:editableComboBox id="projectName" field="appName"

diff --git a/src/main/resources/com/fortify/plugin/jenkins/steps/FortifyUpload/config.jelly b/src/main/resources/com/fortify/plugin/jenkins/steps/FortifyUpload/config.jelly
@@ -17,6 +17,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
     <f:entry title="${%Application name}" help="/plugin/fortify/help-sscProjName.html">
+      <script type="text/javascript" src="${rootURL}/plugin/fortify/purify.min.js"/>
       <script type="text/javascript" src="${rootURL}/plugin/fortify/refresh-projects.js"/>
       <div style="float:left;width:80%;">
         <f:editableComboBox id="projectName" name="appName" field="appName" clazz="setting-input project-name" items="${descriptor.applicationNameItems}" />

diff --git a/src/main/webapp/refresh-issues.js b/src/main/webapp/refresh-issues.js
@@ -37,7 +37,7 @@
                     isUpdateEnable = true;
                 })
                 .catch((error) => {
-                    console.error(error);
+                    console.error(error.message);
                 });
             }
         }
@@ -94,7 +94,7 @@
                 }
             })
             .catch((error) => {
-                console.error(error);
+                console.error(error.message);
             });
         }
 
@@ -113,7 +113,7 @@
                 }
             })
             .catch((error) => {
-                console.error(error);
+                console.error(error.message);
             });
         }
 
@@ -132,7 +132,7 @@
                 }
             })
             .catch((error) => {
-                console.error(error);
+                console.error(error.message);
             });
         }
 
@@ -151,7 +151,7 @@
                 }
             })
             .catch((error) => {
-                console.error(error);
+                console.error(error.message);
             });
         }
 
@@ -178,7 +178,7 @@
                    window.setTimeout(scheduleUpdateCheck, 10000);
                 })
                 .catch((error) => {
-                    console.error(error);
+                    console.error(error.message);
                 });
             }
             window.setTimeout(loadIssues, 0);

diff --git a/src/main/webapp/refresh-projects.js b/src/main/webapp/refresh-projects.js
@@ -64,7 +64,7 @@ function refreshProjectNames(url, elm)
         buttonVer.disabled=false;
     })
     .catch((error) => {
-        console.error(error);
+        console.error(error.message);
     });
 }
 
@@ -128,7 +128,7 @@ function refreshProjectVersions(url, elm)
             }
     })
     .catch((error) => {
-        console.error(error);
+        console.error(error.message);
     });
 }
 
@@ -189,7 +189,7 @@ function refreshTemplateList(url,paramList)
             }
     })
     .catch((error) => {
-        console.error(error);
+        console.error(error.message);
     });
     button.disabled=false;
 }