Author: jacopoc
Date: Thu Dec 15 10:00:12 2011
New Revision: 1214680
URL: http://svn.apache.org/viewvc?rev=1214680&view=rev
Log:
Improved ui flow for "run service" requests: when an error occurs it returns to
the "run service" screen instead of the "submit job" screen (OFBIZ-3571)
Added:
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
- copied, changed from r1214665,
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
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=1214680&r1=1214679&r2=1214680&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Thu
Dec 15 10:00:12 2011
@@ -59,11 +59,6 @@ under the License.
<response name="error" type="none"/>
<response name="success" type="none"/>
</request-map>
- <request-map uri="runService">
- <event type="java" path="org.ofbiz.webapp.event.CoreEvents"
invoke="runService"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="main"/>
- </request-map>
<request-map uri="ping">
<event type="service" invoke="ping"/>
@@ -316,6 +311,13 @@ under the License.
<response name="sync_success" type="view" value="serviceResult"/>
<response name="error" type="view" value="scheduleJob"/>
</request-map>
+ <request-map uri="scheduleServiceSync">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.webapp.event.CoreEvents"
invoke="scheduleService"/>
+ <response name="success" type="view" value="serviceResult"/>
+ <response name="sync_success" type="view" value="serviceResult"/>
+ <response name="error" type="view" value="runService"/>
+ </request-map>
<request-map uri="serviceResult">
<security https="true" auth="true"/>
<response name="success" type="view" value="serviceResult"/>
Copied:
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
(from r1214665,
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl)
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl?p2=ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl&p1=ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl&r1=1214665&r2=1214680&rev=1214680&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
Thu Dec 15 10:00:12 2011
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<form name="scheduleForm" method="post"
action="<@ofbizUrl>scheduleService</@ofbizUrl>">
+<form name="scheduleForm" method="post"
action="<@ofbizUrl>scheduleServiceSync</@ofbizUrl>">
<#list scheduleOptions as scheduleOption>
<input type="hidden" name="${scheduleOption.name}"
value="${scheduleOption.value}"/>
</#list>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=1214680&r1=1214679&r2=1214680&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Thu Dec 15
10:00:12 2011
@@ -167,7 +167,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleScheduleJob}">
<platform-specific>
- <html><html-template
location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html>
+ <html><html-template
location="component://webtools/webapp/webtools/service/setServiceParameterSync.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
