You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/12/18 18:13:41 UTC
svn commit: r605259 - in /ofbiz/trunk/framework/webtools:
config/WebtoolsUiLabels.properties webapp/webtools/WEB-INF/controller.xml
webapp/webtools/service/jobs.ftl
Author: jaz
Date: Tue Dec 18 09:13:36 2007
New Revision: 605259
URL: http://svn.apache.org/viewvc?rev=605259&view=rev
Log:
updated job list UI with new link to reset a RUNNING job
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?rev=605259&r1=605258&r2=605259&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Tue Dec 18 09:13:36 2007
@@ -311,6 +311,7 @@
WebtoolsRemovesMisses=removes:Misses
WebtoolsRepairColumnSizes=Repair Column Sizes
WebtoolsRequireNewTransaction=Require new transaction
+WebtoolsResetJob=Reset Job
WebtoolsRHSMapName=RHS map name
WebtoolsRHSValueName=RHS value name
WebtoolsRunGC=Run GC
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=605259&r1=605258&r2=605259&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Dec 18 09:13:36 2007
@@ -318,6 +318,12 @@
<response name="success" type="view" value="jobList"/>
<response name="error" type="view" value="jobList"/>
</request-map>
+ <request-map uri="resetJob">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="resetScheduledJob"/>
+ <response name="success" type="view" value="jobList"/>
+ <response name="error" type="view" value="jobList"/>
+ </request-map>
<request-map uri="scheduleJob">
<security https="true" auth="true"/>
<response name="success" type="view" value="scheduleJob"/>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl?rev=605259&r1=605258&r2=605259&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl Tue Dec 18 09:13:36 2007
@@ -48,8 +48,12 @@
</#if>
</td>
<td class="button-col">
- <#if !(job.startDateTime?exists) && !(job.finishDateTime?exists) && !(job.cancelDateTime?exists)>
+ <#if (job.statusId?has_content && job.statusId == 'SERVICE_RUNNING')>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsResetJob}</a>
+ <#elseif (!job.statusId?has_content || job.statusId == 'SERVICE_PENDING')>
<a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsCancelJob}</a>
+ <#else>
+
</#if>
</td>
</tr>