Author: buscob
Date: Sun Sep 19 22:44:51 2010
New Revision: 998747
URL: http://svn.apache.org/viewvc?rev=998747&view=rev
Log:
- Used the standard Find screen/forms pattern for FindPortalPage screen.
- Added localization of all fields.
- Enabled sorting on all columns of the PortalPages list
- Added missing column fields in the PortalPages list
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml
ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=998747&r1=998746&r2=998747&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sun Sep 19
22:44:51 2010
@@ -307,6 +307,7 @@
<property key="PageTitleFindPortalPage">
<value xml:lang="en">Find Portal page</value>
<value xml:lang="fr">Rech. page portail</value>
+ <value xml:lang="it">Ricerca pagine portale</value>
</property>
<property key="PageTitleFindUtilCache">
<value xml:lang="de">Cache Wartungsseite</value>
Modified: ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml?rev=998747&r1=998746&r2=998747&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml Sun Sep 19
22:44:51 2010
@@ -23,18 +23,27 @@ under the License.
<form name="FindPortalPages" type="single" target="FindPortalPage"
default-entity-name="PortalPage">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
- <field name="portalPageIdSearch" position="1"
title="${uiLabelMap.CommonId}"><text-find/></field>
+ <field name="portalPageId" position="1"
title="${uiLabelMap.CommonId}"><text-find/></field>
<field name="originalPortalPageId" position="2"><text-find/></field>
<field name="portalPageName"
title="${uiLabelMap.CommonName}"><text-find/></field>
- <field name="parentPortalPageIdSearch" position="2"
title="${uiLabelMap.FormFieldTitle_parentPortalPageId}"><text-find/></field>
+ <field name="parentPortalPageId" position="2"><text-find/></field>
<field name="description"><text-find/></field>
- <field name="securityGroupId" position="2"
title="${uiLabelMap.PartySecurityGroupId}"><text-find/></field>
+ <field name="securityGroupId" position="2"
title="${uiLabelMap.CommonSecurityGroupId}"><text-find/></field>
<field name="searchButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListPortalPages" type="list" list-name="pagesList"
paginate-target="FindPortalPage" separate-columns="true"
+ <form name="ListPortalPages" type="list" list-name="listIt"
paginate-target="FindPortalPage" separate-columns="true"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
- <field name="portalPageId" title="${uiLabelMap.CommonEdit}">
+ <actions>
+ <service service-name="performFind" result-map-list="listIt" >
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="PortalPage"/>
+ <field-map field-name="orderBy"
from-field="parameters.sortField"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="portalPageId" title="${uiLabelMap.CommonId}"
sort-field="true">
<hyperlink description="${portalPageId}" target="EditPortalPage">
<parameter param-name="portalPageId"/>
</hyperlink>
@@ -57,9 +66,11 @@ under the License.
</in-place-editor>
</display>
</field>
- <field name="sequenceNum"><display/></field>
- <field name="originalPortalPageId"><display/></field>
- <field name="ownerUserLoginId"><display/></field>
+ <field name="parentPortalPageId" sort-field="true"><display/></field>
+ <field name="sequenceNum" sort-field="true"><display/></field>
+ <field name="originalPortalPageId" sort-field="true"><display/></field>
+ <field name="ownerUserLoginId" sort-field="true"><display/></field>
+ <field name="securityGroupId"
title="${uiLabelMap.CommonSecurityGroupId}" sort-field="true"><display/></field>
<field name="deleteLink" use-when="originalPortalPageId!=null"
title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" >
<hyperlink target="deletePortalPage"
description="${uiLabelMap.CommonRevertPortalPage}">
<parameter param-name="portalPageId"/>
Modified: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml?rev=998747&r1=998746&r2=998747&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml Sun Sep 19
22:44:51 2010
@@ -28,18 +28,6 @@ under the License.
<actions>
<set field="headerItem" value="portalAdmin"/>
<set field="titleProperty" value="PageTitleFindPortalPage"/>
- <set field="inputFields" from-field="parameters"/>
- <set field="inputFields.portalPageId"
from-field="parameters.portalPageIdSearch"/>
- <set field="inputFields.portalPageId_op"
from-field="parameters.portalPageIdSearch_op"/>
- <set field="inputFields.portalPageId_ic"
from-field="parameters.portalPageIdSearch_ic"/>
- <set field="inputFields.parentPortalPageId"
from-field="parameters.parentPortalPageIdSearch"/>
- <set field="inputFields.parentPortalPageId_op"
from-field="parameters.parentPortalPageIdSearch_op"/>
- <set field="inputFields.parentPortalPageId_ic"
from-field="parameters.parentPortalPageIdSearch_ic"/>
- <service service-name="performFind" result-map="result" >
- <field-map field-name="entityName" value="PortalPage"/>
- <field-map field-name="orderBy"
from-field="parameters.sortField"/>
- </service>
- <set field="pagesList" from-field="result.listIt"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
