Changeset 6569


Ignore:
Timestamp:
Oct 21, 2014, 1:56:42 PM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3-stable/src/core/net/sf/basedb/core/Job.java

    r6566 r6569  
    10631063      data.setJobAgentId(agent == null ? null : agent.getId());
    10641064      PluginDefinitionData plugin = data.getPluginDefinition();
    1065       data.setPluginVersion(plugin == null ? null : plugin.getVersionString());
     1065      if (plugin != null) data.setPluginVersion(plugin.getVersionString());
    10661066    }
    10671067
  • branches/3.3-stable/www/views/jobs/view_job.jsp

    r6510 r6569  
    239239        <th>Plugin</th>
    240240        <td>
    241           <base:propertyvalue item="<%=job%>" property="pluginDefinition.name" />
     241          <base:propertyvalue item="<%=job%>" property="pluginDefinition.name" nulltext="<i>External</i>"/>
    242242          <%=job.getPluginVersion() == null ?
    243             "" : "(version " + HTML.encodeTags(job.getPluginVersion()) + ")"%>
     243            "" : "(" + HTML.encodeTags(job.getPluginVersion()) + ")"%>
    244244        </td>
    245245      </tr>
Note: See TracChangeset for help on using the changeset viewer.