Author: jleroux
Date: Sun Jul 27 05:22:45 2008
New Revision: 680092
URL: http://svn.apache.org/viewvc?rev=680092&view=rev
Log:
An enhancing patch (AjaxPagination.patch) from Bruno Busco "Using screenlets in
Content Application" (https://issues.apache.org/jira/browse/OFBIZ-1881) -
OFBIZ-1881
Modified:
ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
ofbiz/trunk/applications/content/widget/SurveyScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentForms.xml
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sun
Jul 27 05:22:45 2008
@@ -498,6 +498,10 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="FindDataResource"/>
</request-map>
+ <request-map uri="findDataResourceSearchResults">
+ <security auth="true" https="true"/>
+ <response name="success" type="view"
value="findDataResourceSearchResults"/>
+ </request-map>
<request-map uri="navigateDataResource">
<security auth="true" https="true"/>
<response name="success" type="view" value="navigateDataResource"/>
@@ -757,6 +761,10 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="FindContent"/>
</request-map>
+ <request-map uri="findContentSearchResults">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="findContentSearchResults"/>
+ </request-map>
<request-map uri="ContentSetupMenu"><security auth="true"
https="true"/><response name="success" type="view"
value="EditContentType"/></request-map>
<request-map uri="DataSetupMenu"><security auth="true"
https="true"/><response name="success" type="view"
value="EditDataResourceType"/></request-map>
<request-map uri="LayoutMenu"><security auth="true"
https="true"/><response name="success" type="view"
value="ListLayout"/></request-map>
@@ -1230,6 +1238,10 @@
<!-- ================ Survey Requests ================= -->
<request-map uri="FindSurvey"><security auth="true"
https="true"/><response name="success" type="view"
value="FindSurvey"/></request-map>
+ <request-map uri="ListFindSurveySearchResults">
+ <security https="true" auth="true"/>
+ <response name="success" type="view"
value="ListFindSurveySearchResults"/>
+ </request-map>
<request-map uri="EditSurvey"><security auth="true"
https="true"/><response name="success" type="view"
value="EditSurvey"/></request-map>
<request-map uri="createSurvey">
<security auth="true" https="true"/>
@@ -1678,6 +1690,7 @@
<view-map name="EditContentPurpose"
page="component://content/widget/content/ContentScreens.xml#EditContentPurpose"
type="screen"/>
<view-map name="EditContentRole"
page="component://content/widget/content/ContentScreens.xml#EditContentRole"
type="screen"/>
<view-map name="FindContent"
page="component://content/widget/content/ContentScreens.xml#FindContent"
type="screen"/>
+ <view-map name="findContentSearchResults" type="screen"
page="component://content/widget/content/ContentScreens.xml#findContentSearchResults"/>
<view-map name="EditContent"
page="component://content/widget/content/ContentScreens.xml#EditContent"
type="screen"/>
<view-map name="EditContentAssoc"
page="component://content/widget/content/ContentScreens.xml#EditContentAssoc"
type="screen"/>
<view-map name="AddContent"
page="component://content/widget/content/ContentScreens.xml#AddContent"
type="screen"/>
@@ -1694,6 +1707,7 @@
<view-map name="EditContentWorkEfforts"
page="component://content/widget/content/ContentScreens.xml#EditContentWorkEfforts"
type="screen"/>
<view-map name="FindDataResource"
page="component://content/widget/content/DataResourceScreens.xml#FindDataResource"
type="screen"/>
+ <view-map name="findDataResourceSearchResults"
page="component://content/widget/content/DataResourceScreens.xml#findDataResourceSearchResults"
type="screen"/>
<view-map name="navigateDataResource" type="screen"
page="component://content/widget/content/DataResourceScreens.xml#navigateDataResource"/>
<view-map name="listDataResources" type="screen"
page="component://content/widget/content/DataResourceScreens.xml#listDataResources"/>
<view-map name="UploadImage"
page="component://content/widget/content/DataResourceScreens.xml#UploadImage"
type="screen"/>
@@ -1731,6 +1745,10 @@
<view-map name="EditLayoutUrl"
page="component://content/widget/layout/LayoutScreens.xml#EditLayoutUrl"
type="screen"/>
<view-map name="FindSurvey"
page="component://content/widget/SurveyScreens.xml#FindSurvey" type="screen"/>
+ <view-map name="ListFindSurveySearchResults" type="screen"
page="component://content/widget/SurveyScreens.xml#ListFindSurveySearchResults"/>
+
+ <view-map name="ListFindSurveySearchResults" type="screen"
page="component://content/widget/SurveyScreens.xml#ListFindSurveySearchResults"/>
+
<view-map name="EditSurvey"
page="component://content/widget/SurveyScreens.xml#EditSurvey" type="screen"/>
<view-map name="EditSurveyMultiResps"
page="component://content/widget/SurveyScreens.xml#EditSurveyMultiResps"
type="screen"/>
<view-map name="EditSurveyQuestions"
page="component://content/widget/SurveyScreens.xml#EditSurveyQuestions"
type="screen"/>
Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
(original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Sun
Jul 27 05:22:45 2008
@@ -35,8 +35,8 @@
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListFindSurvey" target="" title="" list-name="listIt"
type="list" paginate-target="FindSurvey" paginate="true"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <form name="ListFindSurvey" target="" title="" list-name="listIt"
type="list" paginate-target="FindSurvey"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service result-map-list-name="listIt" result-map-name="result"
service-name="performFind">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -47,6 +47,7 @@
<field name="surveyId" title="${uiLabelMap.SurveySurveyId}"
widget-style="buttontext">
<hyperlink description="${surveyId}"
target="EditSurvey?surveyId=${surveyId}" also-hidden="false"/>
</field>
+ <on-event-update-area event-type="paginate" area-id="search-results"
area-target="ListFindSurveySearchResults"/>
</form>
<form name="EditSurvey" type="single" target="updateSurvey" title=""
default-map-name="survey"
header-row-style="header-row" default-table-style="basic-table">
@@ -310,4 +311,4 @@
<hyperlink also-hidden="false" target-type="plain"
description="${surveyResponseId}"
target="javascript:set_value('${surveyResponseId}')"/>
</field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Sun Jul 27
05:22:45 2008
@@ -445,4 +445,14 @@
</widgets>
</section>
</screen>
+ <screen name="ListFindSurveySearchResults">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-form name="ListFindSurvey"
location="component://content/webapp/content/survey/SurveyForms.xml"/>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sun Jul 27
05:22:45 2008
@@ -59,9 +59,9 @@
</field>
<field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
-
- <form name="ListContent" list-name="listIt" target="" title="" type="list"
paginate-target="findContent"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+
+ <form name="ListContent" target="" title="" list-name="listIt" type="list"
paginate-target="findContent"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -92,6 +92,7 @@
<sub-hyperlink target="editContent?contentId=${contentId}"
description="[${contentId}]" link-style="buttontext"/>
</display-entity>
</field>
+ <on-event-update-area event-type="paginate" area-id="search-results"
area-target="findContentSearchResults"/>
</form>
<form name="LookupContent" target="LookupContent" title="" type="single"
extends="FindContent" header-row-style="header-row"
default-table-style="basic-table"/>
@@ -465,4 +466,4 @@
<hyperlink also-hidden="false"
description="${uiLabelMap.CommonDelete}"
target="deleteWorkEffortContent?workEffortContentTypeId=${workEffortContentTypeId}&fromDate=${fromDate}&workEffortId=${workEffortId}&contentId=${contentId}"/>
</field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sun Jul
27 05:22:45 2008
@@ -64,6 +64,13 @@
</fail-widgets>
</section>
</screen>
+ <screen name="findContentSearchResults">
+ <section>
+ <widgets>
+ <include-form name="ListContent"
location="component://content/widget/content/ContentForms.xml"/>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditContent">
<section>
<actions>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sun
Jul 27 05:22:45 2008
@@ -57,8 +57,8 @@
<field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="ListDataResource" type="list" list-name="listIt"
paginate-target="findDataResource"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <form name="ListDataResource" target="" title="" list-name="listIt"
type="list" paginate-target="findDataResource"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -78,6 +78,7 @@
<field name="localeString"><display-entity entity-name="CountryCode"
description="${countryName}[${countryCode}]"
key-field-name="countryCode"></display-entity></field>
<field name="createdByUserLogin"><display-entity also-hidden="false"
entity-name="PartyNameView" key-field-name="partyId"
description="${groupName}${firstName} ${lastName}"/></field>
<field name="dataCategoryId"><display-entity
entity-name="DataCategory"
description="${categoryName}[${dataCategoryId}]"></display-entity></field>
+ <on-event-update-area event-type="paginate" area-id="search-results"
area-target="findDataResourceSearchResults"/>
</form>
<form name="LookupDataResource" target="LookupDataResource" title=""
type="single"
@@ -416,4 +417,4 @@
<field name="textData" id-name="textData"><textarea cols="120"
rows="20" visual-editor-enable="true"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified:
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=680092&r1=680091&r2=680092&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun
Jul 27 05:22:45 2008
@@ -47,6 +47,13 @@
</widgets>
</section>
</screen>
+ <screen name="findDataResourceSearchResults">
+ <section>
+ <widgets>
+ <include-form name="ListDataResource"
location="component://content/widget/content/DataResourceForms.xml"/>
+ </widgets>
+ </section>
+ </screen>
<screen name="navigateDataResource">
<section>
<actions>
