Changeset 7763 for branches/3.15-stable

Timestamp:

Dec 17, 2019, 8:22:14 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2201: The "Dry run" selection is lost if "Re-configure job" functionality is used

File:

• branches/3.15-stable/www/common/plugin/configure.jsp (modified) (3 diffs)

branches/3.15-stable/www/common/plugin/configure.jsp

@@ -80 +80 @@
 <%!
 List<?> getParameterValues(PluginParameter<?> pp, DbControl dc, javax.servlet.http.HttpServletRequest request, 
-  PluginConfigurationRequest pcRequest, ItemContext currentContext)
+  PluginConfigurationRequest pcRequest, ItemContext currentContext, Job job)
 {
   ParameterType<?> pType = pp.getParameterType();
@@ -106 +106 @@
     Object charset = currentContext.getObject("last-file-charset");
     if (charset != null) values = Collections.singletonList(charset);
+  }
+  
+  // Special handling for "dryRun" parameter which is typically not stored as a job proerty
+  if ((values == null || values.size() == 0) && Parameters.DRY_RUN_PARAMETER.equals(pp.getName()))
+  {
+    if (job != null && job.isDryRun())
+    {
+      values = Collections.singletonList(true);
+    }
   }
   
@@ -272 +281 @@
         json.put("enumeration", pType.isEnumeration() ? 1 : 0);
         json.put("multiplicity", pType.getMultiplicity());
-        List<?> values = getParameterValues(pp, dc, request, pcRequest, currentContext);
+        List<?> values = getParameterValues(pp, dc, request, pcRequest, currentContext, job);
         json.put("values", convertToJson(values, dc, pType, dateFormatter, dateTimeFormatter));
       }