Re: svn commit: r677042 - in /ofbiz/trunk/applications/orde
Locked
Re: svn commit: r677042 - in /ofbiz/trunk/applications/orde
 
|
Hans,
One bit of advice about this... It would be preferable to keep the CommonRequestDecorator where it was and change the screens that use it from <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> to <decorator-screen name="CommonRequestDecorator" location="${parameters.requestDecoratorLocation}"> which will make the decorated screens easier to reuse. -Adrian [hidden email] wrote: > Author: hansbak > Date: Tue Jul 15 14:19:45 2008 > New Revision: 677042 > > URL: http://svn.apache.org/viewvc?rev=677042&view=rev > Log: > move the request decorator to the commonscreens file > > Modified: > ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml > ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml > > Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=677042&r1=677041&r2=677042&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Tue Jul 15 14:19:45 2008 > @@ -54,6 +54,40 @@ > </section> > </screen> > > + <screen name="CommonRequestDecorator"> > + <section> > + <actions> > + </actions> > + <widgets> > + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <!-- > + <condition> > + <if-has-permission permission="ORDERMGR" action="_VIEW"/> > + </condition> > + --> > + <widgets> > + <platform-specific> > + <html><html-template location="component://order/webapp/ordermgr/request/RequestTabBar.ftl"/></html> > + </platform-specific> > + <container> > + <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label> > + </container> > + <decorator-section-include name="body"/> > + </widgets> > + <!-- > + <fail-widgets> > + <label style="h3">${uiLabelMap.OrderViewPermissionError}</label> > + </fail-widgets> > + --> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > <screen name="CommonQuoteDecorator"> > <section> > <actions> > > Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=677042&r1=677041&r2=677042&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) > +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Tue Jul 15 14:19:45 2008 > @@ -20,39 +20,6 @@ > > <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > - <screen name="CommonRequestDecorator"> > - <section> > - <actions> > - </actions> > - <widgets> > - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <!-- > - <condition> > - <if-has-permission permission="ORDERMGR" action="_VIEW"/> > - </condition> > - --> > - <widgets> > - <platform-specific> > - <html><html-template location="component://order/webapp/ordermgr/request/RequestTabBar.ftl"/></html> > - </platform-specific> > - <container> > - <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label> > - </container> > - <decorator-section-include name="body"/> > - </widgets> > - <!-- > - <fail-widgets> > - <label style="h3">${uiLabelMap.OrderViewPermissionError}</label> > - </fail-widgets> > - --> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > <screen name="FindRequest"> > <section> > <actions> > @@ -108,7 +75,7 @@ > <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="requestItems" order-by-list-name="orderBy"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container> > <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> > @@ -134,7 +101,7 @@ > <entity-one entity-name="StatusItem" value-name="currentStatus"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -168,7 +135,7 @@ > </entity-and> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <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"/> > @@ -196,7 +163,7 @@ > </entity-and> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -235,7 +202,7 @@ > <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/getNextSequenceNum.bsh"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -276,7 +243,7 @@ > <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/requestitemnotes.bsh"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -317,7 +284,7 @@ > </entity-and> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -358,7 +325,7 @@ > <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/setRequestQuote.bsh"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -401,7 +368,7 @@ > <set field="parameters.comments" from-field="custRequestItem.story"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -440,7 +407,7 @@ > <set field="parameters.selectedAmount" from-field="custRequestItem.selectedAmount"/> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > @@ -481,7 +448,7 @@ > </entity-and> > </actions> > <widgets> > - <decorator-screen name="CommonRequestDecorator"> > + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <screenlet id="AddCustRequestItemWorkEffortPanel" title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}" collapsible="true"> > <link target="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/> > > > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |