You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/07/18 05:30:21 UTC
svn commit: r795304 - in /ofbiz/trunk: applications/order/data/
applications/order/webapp/ordermgr/WEB-INF/
applications/order/webapp/ordermgr/request/
applications/order/widget/ordermgr/
applications/party/webapp/partymgr/WEB-INF/ applications/party/w...
Author: hansbak
Date: Sat Jul 18 03:30:19 2009
New Revision: 795304
URL: http://svn.apache.org/viewvc?rev=795304&view=rev
Log:
rename Request files to CustRequest files as discussed in the mailing list
Added:
ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
- copied unchanged from r795025, ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
- copied, changed from r795025, ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/applications/workeffort/widget/CustRequestForms.xml
- copied unchanged from r795025, ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml
ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml
- copied, changed from r795025, ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
- copied unchanged from r795025, ofbiz/trunk/specialpurpose/ecommerce/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
- copied, changed from r795025, ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
- copied, changed from r795025, ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
Removed:
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/request/
ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
Modified:
ofbiz/trunk/applications/order/data/OrderPortletData.xml
ofbiz/trunk/applications/order/data/OrderTypeData.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/RequestForms.xml
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Sat Jul 18 03:30:19 2009
@@ -24,14 +24,14 @@
<PortalPortlet portalPortletId="INCOM_CUST_REQUESTS"
portletName="Incoming Cust.Requests"
screenName="IncomingCustRequests"
- screenLocation="component://order/widget/ordermgr/RequestScreens.xml"
+ screenLocation="component://order/widget/ordermgr/CustRequestScreens.xml"
description="List Request List for a request taker" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"
screenshot="/images/portlets/INCOM_CUST_REQUESTS.png"/>
<PortletPortletCategory portalPortletId="INCOM_CUST_REQUESTS" portletCategoryId="CUST_REQUEST"/>
<PortalPortlet portalPortletId="ViewCustRequest"
portletName="View a specific customer request"
screenName="ViewCustRequest"
- screenLocation="component://order/widget/ordermgr/RequestScreens.xml"
+ screenLocation="component://order/widget/ordermgr/CustRequestScreens.xml"
description="View your own customer request inclusive of notes"/>
<PortletPortletCategory portalPortletId="ViewCustRequest" portletCategoryId="CUST_REQUEST"/>
@@ -39,10 +39,10 @@
<PortalPortlet portalPortletId="ListCustRequests"
portletName="List Cust Requests for a customer"
screenName="ListCustRequests"
- screenLocation="component://order/widget/ordermgr/RequestScreens.xml"
+ screenLocation="component://order/widget/ordermgr/CustRequestScreens.xml"
description="List Cust Requests to the customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW"
editFormName="EditCustReqStatusId"
- editFormLocation="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ editFormLocation="component://order/widget/ordermgr/CustRequestForms.xml"/>
<PortletPortletCategory portalPortletId="ListCustRequests" portletCategoryId="LIST_CUSTOMER"/>
<!--List of order(s) placed by a customer in order -->
Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Sat Jul 18 03:30:19 2009
@@ -346,13 +346,13 @@
<EmailTemplateSetting
emailTemplateSettingId="CUST_REQ_ACCEPTED"
- bodyScreenLocation="component://order/widget/ordermgr/RequestScreens.xml#CreateCustRequestNotification"
+ bodyScreenLocation="component://order/widget/ordermgr/CustRequestScreens.xml#CreateCustRequestNotification"
subject="OFBiz - Your Request is received: '${custRequestName}' #CR${custRequestId}"/>
<EmailTemplateSetting emailTemplateSettingId="CUST_REQ_COMPLETED"
- bodyScreenLocation="component://order/widget/ordermgr/RequestScreens.xml#CompletedCustRequestNotification"
+ bodyScreenLocation="component://order/widget/ordermgr/CustRequestScreens.xml#CompletedCustRequestNotification"
subject="OFBiz - Your Request is complete: '${custRequestName}' #CR${custRequestId}"/>
<EmailTemplateSetting emailTemplateSettingId="CUST_REQ_NOTE_ADDED"
- bodyScreenLocation="component://order/widget/ordermgr/RequestScreens.xml#AddNoteCustRequestNotification"
+ bodyScreenLocation="component://order/widget/ordermgr/CustRequestScreens.xml#AddNoteCustRequestNotification"
subject="OFBiz - A Note has been added to your request: '${custRequestName}' #CR${custRequestId}"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Jul 18 03:30:19 2009
@@ -1746,20 +1746,20 @@
<view-map name="ViewQuoteProfit" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteProfit"/>
<view-map name="EditQuoteReportMail" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#EditQuoteReportMail"/>
- <view-map name="FindRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#FindRequest"/>
- <view-map name="ViewRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#ViewRequest"/>
- <view-map name="EditRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequest"/>
- <view-map name="EditRequestCustomer" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequestCustomer"/>
- <view-map name="EditRequestItem" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequestItem"/>
- <view-map name="RequestItems" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestItems"/>
- <view-map name="RequestRoles" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestRoles"/>
- <view-map name="RequestItemNotes" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestItemNotes"/>
- <view-map name="RequestItemQuotes" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestItemQuotes"/>
- <view-map name="RequestItemRequirements" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestItemRequirements"/>
- <view-map name="EditRequestItemWorkEfforts" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequestItemWorkEfforts"/>
- <view-map name="CreateQuoteAndQuoteItemForRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#CreateQuoteAndQuoteItemForRequest"/>
- <view-map name="EditQuoteItemForRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditQuoteItemForRequest"/>
- <view-map name="EditCustRequestContent" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditCustRequestContent"/>
+ <view-map name="FindRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#FindRequest"/>
+ <view-map name="ViewRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#ViewRequest"/>
+ <view-map name="EditRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#EditRequest"/>
+ <view-map name="EditRequestCustomer" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#EditRequestCustomer"/>
+ <view-map name="EditRequestItem" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#EditRequestItem"/>
+ <view-map name="RequestItems" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#RequestItems"/>
+ <view-map name="RequestRoles" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#RequestRoles"/>
+ <view-map name="RequestItemNotes" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#RequestItemNotes"/>
+ <view-map name="RequestItemQuotes" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#RequestItemQuotes"/>
+ <view-map name="RequestItemRequirements" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#RequestItemRequirements"/>
+ <view-map name="EditRequestItemWorkEfforts" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#EditRequestItemWorkEfforts"/>
+ <view-map name="CreateQuoteAndQuoteItemForRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#CreateQuoteAndQuoteItemForRequest"/>
+ <view-map name="EditQuoteItemForRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#EditQuoteItemForRequest"/>
+ <view-map name="EditCustRequestContent" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#EditCustRequestContent"/>
<view-map name="AddQuoteWorkEffort" type="screen" page="component://order/widget/ordermgr/QuoteWorkEffortScreens.xml#AddQuoteWorkEffort"/>
<view-map name="EditQuoteWorkEffort" type="screen" page="component://order/widget/ordermgr/QuoteWorkEffortScreens.xml#EditQuoteWorkEffort"/>
Copied: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (from r795025, ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?p2=ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml&p1=ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml&r1=795025&r2=795304&rev=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sat Jul 18 03:30:19 2009
@@ -32,10 +32,10 @@
<decorator-section name="body">
<screenlet title="${uiLabelMap.OrderFindRequests}" collapsible="true" id="findRequests">
<link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
- <include-form name="FindRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequests" >
- <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -79,35 +79,35 @@
<widgets>
<container style="lefthalf">
<screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
- <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="requestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.OrderRequestRoles}">
- <include-form name="ViewRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ViewRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.OrderCustRequestStatusList}" navigation-form-name="ViewRequest">
- <include-form name="ViewRequestStatus" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ViewRequestStatus" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
</platform-specific>
<screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequest">
- <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ViewRequestCommunicationEvents" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequest">
- <include-form name="ViewRequestWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ViewRequestWorkEfforts" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ViewRequest">
- <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListCustRequestContent" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</container>
<container style="clear"/>
<screenlet title="${uiLabelMap.PageTitleRequestItems}">
- <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="OverviewRequestItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleRequestItemNotes}">
- <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestItemNotes" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -152,10 +152,10 @@
<if-compare field="parameters.small" operator="equals" value="Y"/>
</condition>
<widgets>
- <include-form name="EditSmallCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditSmallCustRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</widgets>
<fail-widgets>
- <include-form name="EditCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditCustRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</fail-widgets>
</section>
</screenlet>
@@ -176,7 +176,7 @@
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.OrderRequest}">
- <include-form name="EditRequestCustomer" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditRequestCustomer" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -199,9 +199,9 @@
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet id="EditRequestRolePanel" title="${uiLabelMap.PageTitleEditRequestRoles}" collapsible="true">
- <include-form name="EditRequestRole" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditRequestRole" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
- <include-form name="ListRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -230,7 +230,7 @@
<link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
<parameter param-name="custRequestId"/>
</link>
- <include-form name="ListRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -268,7 +268,7 @@
<parameter param-name="custRequestId"/>
</link>
</container>
- <include-form name="EditCustRequestItem" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditCustRequestItem" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/request/CopyRequestItem.ftl"/></html>
</platform-specific>
@@ -309,8 +309,8 @@
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/request/requestitemnotes.ftl"/></html>
</platform-specific>
- <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- <include-form name="EditRequestItemNote" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestItemNotes" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ <include-form name="EditRequestItemNote" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</widgets>
</section>
</container>
@@ -353,7 +353,7 @@
<parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
</link>
</container>
- <include-form name="ListRequestItemRequirements" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestItemRequirements" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</widgets>
</section>
</container>
@@ -394,7 +394,7 @@
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/request/QuoteLinks.ftl"/></html>
</platform-specific>
- <include-form name="ListRequestQuoteItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestQuoteItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</widgets>
</section>
</container>
@@ -434,7 +434,7 @@
<container style="screenlet-body">
<section>
<widgets>
- <include-form name="EditQuoteItemForRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditQuoteItemForRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</widgets>
</section>
</container>
@@ -473,7 +473,7 @@
<container style="screenlet-body">
<section>
<widgets>
- <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</widgets>
</section>
</container>
@@ -509,9 +509,9 @@
<link target="EditRequestItem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
<parameter param-name="custRequestId"/>
</link>
- <include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="AddCustRequestItemWorkEffort" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
- <include-form name="ListCustRequestItemWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListCustRequestItemWorkEfforts" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -544,9 +544,9 @@
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AddCustRequestContentsPanel" title="${uiLabelMap.PageTitleAddContent}" collapsible="true">
- <include-form name="AddCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="AddCustRequestContent" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
- <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListCustRequestContent" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -575,7 +575,7 @@
<widgets>
<screenlet title="${uiLabelMap.OrderIncomingCustRequests}" navigation-menu-name="RequestScreenletMenu">
<include-menu name="RequestScreenletMenu" location="component://order/widget/ordermgr/Menus.xml"/>
- <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequestList" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -678,7 +678,7 @@
<link target="EditRequestCustomer" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
</widgets>
</section>
- <include-form name="ListMyCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListMyCustRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
@@ -691,7 +691,7 @@
</actions>
<widgets>
<screenlet title="${screenletTitle}" navigation-form-name="ListCustRequests" >
- <include-form name="ListCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListCustRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
</section>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jul 18 03:30:19 2009
@@ -1256,7 +1256,7 @@
<view-map name="AddCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#AddCommContent"/>
<view-map name="EditCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommContent"/>
<view-map name="EditRequestFromCommEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditRequestFromCommEvent"/>
- <view-map name="ViewRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#ViewRequest"/>
+ <view-map name="ViewRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#ViewRequest"/>
<view-map name="CreateNewParty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreateNewParty"/>
<view-map name="NewCustomer" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#NewCustomer"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat Jul 18 03:30:19 2009
@@ -873,7 +873,7 @@
<field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="70" rows="20"/></field>
<field name="submit" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListRequests" extends="ListRequests" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <form name="ListRequests" extends="ListRequests" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<field name="custRequestName">
<hyperlink description="${custRequestName} [${custRequestId}]" target="/ordermgr/control/ViewRequest" target-type="inter-app">
<parameter param-name="custRequestId"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sat Jul 18 03:30:19 2009
@@ -254,7 +254,7 @@
</actions>
<widgets>
<screenlet title="${uiLabelMap.OrderRequestList}">
- <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
</section>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sat Jul 18 03:30:19 2009
@@ -671,7 +671,7 @@
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://workeffort/widget/CommonScreens.xml#main"/>
- <view-map name="RequestList" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestList"/>
+ <view-map name="RequestList" type="screen" page="component://workeffort/widget/CustRequestScreens.xml#RequestList"/>
<view-map name="mytasks" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#mytasks"/>
Copied: ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml (from r795025, ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml?p2=ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml&p1=ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml&r1=795025&r2=795304&rev=795304&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml Sat Jul 18 03:30:19 2009
@@ -45,7 +45,7 @@
<container style="screenlet-body">
<section>
<widgets>
- <include-form name="ListRequests" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
+ <include-form name="ListRequests" location="component://workeffort/widget/CustRequestForms.xml"/>
</widgets>
</section>
</container>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Jul 18 03:30:19 2009
@@ -1963,8 +1963,8 @@
<view-map name="ListQuotes" type="screen" page="component://ecommerce/widget/QuoteScreens.xml#ListQuotes"/>
<view-map name="ViewQuote" type="screen" page="component://ecommerce/widget/QuoteScreens.xml#ViewQuote"/>
<!-- Request Views -->
- <view-map name="ListRequests" type="screen" page="component://ecommerce/widget/RequestScreens.xml#ListRequests"/>
- <view-map name="ViewRequest" type="screen" page="component://ecommerce/widget/RequestScreens.xml#ViewRequest"/>
+ <view-map name="ListRequests" type="screen" page="component://ecommerce/widget/CustRequestScreens.xml#ListRequests"/>
+ <view-map name="ViewRequest" type="screen" page="component://ecommerce/widget/CustRequestScreens.xml#ViewRequest"/>
<!-- Blog Views -->
<view-map name="MainBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#MainBlog"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sat Jul 18 03:30:19 2009
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<field name="workEffortId">
<hyperlink target="/projectmgr/control/taskView" description="${workEffortName} [${workEffortId}]" target-type="inter-app">
<parameter param-name="workEffortId"/>
@@ -29,7 +29,7 @@
</field>
</form>
- <form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/RequestForms.xml">
+ <form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/CustRequestForms.xml">
<field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"><hidden value="${userLogin.partyId}"/></field>
<field name="custRequestDate"><ignored/></field>
<field name="childWorkEffortId"><ignored/></field>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/RequestForms.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/RequestForms.xml Sat Jul 18 03:30:19 2009
@@ -20,7 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="AddCustRequestContent" type="upload" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml"
+ <form name="AddCustRequestContent" type="upload" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml"
target="createCustRequestContent?custRequestId=${parameters.custRequestId}" >
<field name="custRequestId" map-name="parameters"><hidden/></field>
<field name="contentId"><hidden/></field>
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml Sat Jul 18 03:30:19 2009
@@ -30,7 +30,7 @@
<PortalPortlet portalPortletId="ProjectRequestList"
portletName="Project Customer Request List"
screenName="ProjectRequestList"
- screenLocation="component://projectmgr/widget/RequestScreens.xml"
+ screenLocation="component://projectmgr/widget/CustRequestScreens.xml"
description="Project Customer Request List" securityServiceName="projectMgrRequestPermission" securityMainAction="VIEW"/>
<PortletPortletCategory portalPortletId="ProjectRequestList" portletCategoryId="PROJECTMANAGER"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=795304&r1=795303&r2=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sat Jul 18 03:30:19 2009
@@ -731,9 +731,9 @@
<view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskView"/>
<view-map name="Timesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#Timesheet"/>
<view-map name="EditTaskFromRequest" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskFromRequest"/>
- <view-map name="RequestList" type="screen" page="component://projectmgr/widget/RequestScreens.xml#RequestList"/>
- <view-map name="EditRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#EditRequest"/>
- <view-map name="ViewRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#ViewRequest"/>
+ <view-map name="RequestList" type="screen" page="component://projectmgr/widget/CustRequestScreens.xml#RequestList"/>
+ <view-map name="EditRequest" type="screen" page="component://projectmgr/widget/CustRequestScreens.xml#EditRequest"/>
+ <view-map name="ViewRequest" type="screen" page="component://projectmgr/widget/CustRequestScreens.xml#ViewRequest"/>
<view-map name="EditProjectContents" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectContents"/>
<view-map name="EditTaskContents" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskContents"/>
<view-map name="testWorkEffortSurvey" type="screen" page="component://projectmgr/widget/SurveyScreens.xml#TestWorkEffortSurvey"/>
Copied: ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml (from r795025, ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml?p2=ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml&p1=ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml&r1=795025&r2=795304&rev=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml Sat Jul 18 03:30:19 2009
@@ -36,9 +36,9 @@
<screenlet title="${uiLabelMap.ProjectMgrCustomerRequestList}" navigation-menu-name="ProjectRequestList">
<label style="h2" text="${uiLabelMap.ProjectMgrAcceptedCustomerRequestList}"/>
<link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
- <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ <include-form name="ListRequests" location="component://projectmgr/widget/forms/CustRequestForms.xml"/>
<label style="h2" text="${uiLabelMap.ProjectMgrReviewedCustomerRequestTaskList}"/>
- <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/CustRequestForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
@@ -83,7 +83,7 @@
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.OrderRequest}">
- <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/CustRequestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -131,7 +131,7 @@
<decorator-section name="body">
<container style="lefthalf">
<screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
- <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="requestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</container>
<container style="righthalf">
@@ -139,19 +139,19 @@
<html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
</platform-specific>
<screenlet title="${uiLabelMap.OrderRequestRoles}">
- <include-form name="ViewRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ViewRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequestCommunicationEvents">
- <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ViewRequestCommunicationEvents" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequestWorkEfforts">
- <include-form name="ViewRequestWorkEfforts" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ <include-form name="ViewRequestWorkEfforts" location="component://projectmgr/widget/forms/CustRequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent">
<!-- <link target="EditCustRequestContent" text="${uiLabelMap.CommonNew} ${uiLabelMap.ContentContent}">
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
</link> -->
- <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="ListCustRequestContent" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</container>
<container style="clear"/>
Copied: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml (from r795025, ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml?p2=ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml&p1=ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml&r1=795025&r2=795304&rev=795304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml Sat Jul 18 03:30:19 2009
@@ -20,7 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ListRequests" type="list" extends="ListRequestList" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml"
+ <form name="ListRequests" type="list" extends="ListRequestList" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml"
paginate-target="requestlist" >
<field name="createTaskFromRequest" title="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" widget-style="buttontext">
<hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="/projectmgr/control/EditTaskFromRequest" target-type="inter-app">
@@ -29,7 +29,7 @@
</field>
</form>
<form name="EditCustRequest" type="single" target="createrequest" title="Request" default-map-name="custRequest"
- extends="EditSmallCustRequest" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ extends="EditSmallCustRequest" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<alt-target use-when="custRequest!=null" target="updaterequest"/>
<!--field name="custRequestName"><text default-value="${communicationEvent.subject}"/></field-->
<field name="shortDescription" parameter-name="description" use-when="custRequest==null" encode-output="false"><text/></field>
@@ -182,14 +182,14 @@
<display-entity also-hidden="false" entity-name="StatusItem"/>
</field>
</form>
- <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<field name="workEffortId">
<hyperlink target="taskView" description="${workEffortName} [${workEffortId}]">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
</form>
- <form name="OverviewRequestItems" extends="OverviewRequestItems" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <form name="OverviewRequestItems" extends="OverviewRequestItems" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<field name="custRequestItemSeqId" title="${uiLabelMap.CommonNbr}"><display/></field>
<field name="story" title="${uiLabelMap.CommonText}"><display/></field>
<field name="productId"><ignored/></field>
@@ -197,7 +197,7 @@
<field name="quantity"><ignored/></field>
<field name="description"><ignored/></field>
</form>
- <form name="ListRequestItemNotes" extends="ListRequestItemNotes" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <form name="ListRequestItemNotes" extends="ListRequestItemNotes" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<field name="custRequestItemSeqId" title="${uiLabelMap.CommonNbr}"><display/></field>
<field name="noteDateTime"><ignored/></field>
<field name="partyId"><ignored/></field>