OFBiz › OFBiz - Commits

svn commit: r992791 - in /ofbiz/trunk/framework/webtools: webapp/webtools/WEB-INF/actions/service/Services.groovy webapp/webtools/service/services.ftl widget/LogScreens.xml widget/ServiceForms.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

Sep 05, 2010; 2:19pm

svn commit: r992791 - in /ofbiz/trunk/framework/webtools: webapp/webtools/WEB-INF/actions/service/Services.groovy webapp/webtools/service/services.ftl widget/LogScreens.xml widget/ServiceForms.xml

513 posts

Author: buscob
Date: Sun Sep 5 14:19:11 2010
New Revision: 992791

URL: http://svn.apache.org/viewvc?rev=992791&view=rev
Log:
Converted WebTools->Logs->Service logs screen from FTL to form widget

Removed:
ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/ServiceForms.xml

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy?rev=992791&r1=992790&r2=992791&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy Sun Sep 5 14:19:11 2010
@@ -45,4 +45,9 @@ log.each { rs, value ->

serviceList.add(service);
}
-context.services = serviceList;
+sortField = parameters.sortField;
+if (sortField) {
+ context.services = UtilMisc.sortMaps(serviceList, UtilMisc.toList(sortField));
+} else {
+ context.services = serviceList;
+}

Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=992791&r1=992790&r2=992791&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sun Sep 5 14:19:11 2010
@@ -65,9 +65,9 @@ under the License.
<widgets>
<decorator-screen name="log-decorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/service/services.ftl"/></html>
- </platform-specific>
+ <screenlet title="${uiLabelMap.PageTitleServiceList}">
+ <include-form name="ListServices" location="component://webtools/widget/ServiceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/framework/webtools/widget/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceForms.xml?rev=992791&r1=992790&r2=992791&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceForms.xml Sun Sep 5 14:19:11 2010
@@ -109,4 +109,12 @@ under the License.
<field name="ttl" title="${uiLabelMap.WebtoolsTTL} (ms)"><display/></field>
<field name="runTime" title="${uiLabelMap.CommonTime} (ms)"><display/></field>
</form>
+ <form name="ListServices" type="list" list-name="services" paginate-target="ServiceLog" separate-columns="true"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+ <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}" sort-field="true"><display/></field>
+ <field name="localName" title="${uiLabelMap.WebtoolsDispatcherName}" sort-field="true"><display/></field>
+ <field name="modeStr" title="${uiLabelMap.WebtoolsMode}" sort-field="true"><display default-value="${uiLabelMap.CommonNone}"/></field>
+ <field name="startTime" title="${uiLabelMap.CommonStartDateTime}" sort-field="true"><display/></field>
+ <field name="endTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display default-value="${uiLabelMap.WebtoolsStatusRunning}"/></field>
+ </form>
</forms>