Changeset 6569

Timestamp:

Oct 21, 2014, 1:56:42 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1871: Make it possible to explicitely set plug-in version on jobs

Do not clear the version string when a job is started.
View dialog for jobs display 'External' instead of 'none'.

Location:

branches/3.3-stable

Files:

• src/core/net/sf/basedb/core/Job.java (modified) (1 diff)
• www/views/jobs/view_job.jsp (modified) (1 diff)

branches/3.3-stable/src/core/net/sf/basedb/core/Job.java

@@ -1063 +1063 @@
       data.setJobAgentId(agent == null ? null : agent.getId());
       PluginDefinitionData plugin = data.getPluginDefinition();
-      data.setPluginVersion(plugin == null ? null : plugin.getVersionString());
+      if (plugin != null) data.setPluginVersion(plugin.getVersionString());
     }
 

branches/3.3-stable/www/views/jobs/view_job.jsp

@@ -239 +239 @@
         <th>Plugin</th>
         <td>
-          <base:propertyvalue item="<%=job%>" property="pluginDefinition.name" /> 
+          <base:propertyvalue item="<%=job%>" property="pluginDefinition.name" nulltext="<i>External</i>"/> 
           <%=job.getPluginVersion() == null ?
-            "" : "(version " + HTML.encodeTags(job.getPluginVersion()) + ")"%>
+            "" : "(" + HTML.encodeTags(job.getPluginVersion()) + ")"%>
         </td>
       </tr>