svn commit: r1292343 - in /ofbiz/trunk/applications/mark
Locked
svn commit: r1292343 - in /ofbiz/trunk/applications/mark
 
|
Author: adrianc
Date: Wed Feb 22 15:26:39 2012 New Revision: 1292343 URL: http://svn.apache.org/viewvc?rev=1292343&view=rev Log: A bunch of work in Marketing Campaign: fixed UI layout, removed redundant and unused services, fixed services that didn't work. Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml ofbiz/trunk/applications/marketing/servicedef/services.xml ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=1292343&r1=1292342&r2=1292343&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Wed Feb 22 15:26:39 2012 @@ -55,7 +55,7 @@ under the License. <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> </check-permission> <check-errors/> - + <!-- FIXME: This does not work due to related entities --> <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="MarketingCampaign" map="lookupPKMap" value-field="lookedUpValue"/> @@ -113,87 +113,36 @@ under the License. </simple-method> <!-- MarketingCampaignRole methods --> - <simple-method method-name="addRoleToMarketingCampaign" short-description="Add Role To MarketingCampaign"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaignRole" value-field="newEntity"/> - <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map="parameters" value-field="newEntity"/> --> - <set-pk-fields map="parameters" value-field="newEntity"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="removeRoleFromMarketingCampaign" short-description="Remove Role from MarketingCampaign"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaignRole" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaignRole" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="createMarketingCampaignRole" short-description="Add Role To MarketingCampaign"> <!-- allow if userLogin.partyId = parameters.partyId or has permission --> <if> <condition> <and> - <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> - <not><if-has-permission permission="MARKETING" action="_CREATE"/></not> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals" /> + <not><if-has-permission permission="MARKETING" action="_CREATE" /></not> </and> </condition> <then> <add-error> - <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/> + <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError" /> </add-error> </then> </if> - - <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/> - - <!-- okay, now check for all errors --> - <check-errors/> - - - <make-value entity-name="MarketingCampaignRole" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - + <entity-one entity-name="MarketingCampaignRole" value-field="marketingCampaignRole" /> + <if-empty field="marketingCampaignRole"> + <make-value entity-name="MarketingCampaignRole" value-field="marketingCampaignRole" map="parameters" /> + <create-value value-field="marketingCampaignRole" /> + <check-errors /> + </if-empty> </simple-method> - <simple-method method-name="updateMarketingCampaignRole" short-description="Update Add Role To MarketingCampaign"> - <!-- allow if userLogin.partyId = parameters.partyId or has permission --> - <if> - <condition> - <and> - <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> - <not><if-has-permission permission="MARKETING" action="_UPDATE"/></not> - </and> - </condition> - <then> - <add-error> - <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/> - </add-error> - </then> - </if> - <check-errors/> - <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/> - - <entity-one entity-name="MarketingCampaignRole" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="deleteMarketingCampaignRole" short-description="Remove Role from MarketingCampaign"> <check-permission permission="MARKETING" action="_DELETE"> <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> </check-permission> <check-errors/> - <entity-one entity-name="MarketingCampaignRole" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> </simple-method> + </simple-methods> Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1292343&r1=1292342&r2=1292343&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/servicedef/services.xml (original) +++ ofbiz/trunk/applications/marketing/servicedef/services.xml Wed Feb 22 15:26:39 2012 @@ -98,28 +98,12 @@ under the License. </service> <!-- MarketingCampaignRole Services --> - <service name="addRoleToMarketingCampaign" default-entity-name="MarketingCampaignRole" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="addRoleToMarketingCampaign" auth="true"> - <description>Add Role to MarketingCampaign</description> - <auto-attributes include="pk" mode="IN" optional="false"/> - </service> - <service name="removeRoleFromMarketingCampaign" default-entity-name="MarketingCampaignRole" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="removeRoleFromMarketingCampaign" auth="true"> - <description>Remove Role from MarketingCampaign</description> - <auto-attributes include="pk" mode="IN" optional="false"/> - </service> <service name="createMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple" location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="createMarketingCampaignRole" auth="true"> <description>Add Role to Campaign</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="updateMarketingCampaignRole" auth="true"> - <description>Update Role to Campaign Join</description> - <auto-attributes include="pk" mode="IN" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> - </service> <service name="deleteMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple" location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="deleteMarketingCampaignRole" auth="true"> <description>Remove Role from Campaign</description> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=1292343&r1=1292342&r2=1292343&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Wed Feb 22 15:26:39 2012 @@ -155,16 +155,6 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="EditMarketingCampaignRoles"/> </request-map> - <request-map uri="addRoleToMarketingCampaign"><security https="true" auth="true"/> - <event type="service" path="" invoke="addRoleToMarketingCampaign"/> - <response name="success" type="view" value="EditMarketingCampaignRoles"/> - <response name="error" type="view" value="EditMarketingCampaignRoles"/> - </request-map> - <request-map uri="removeRoleFromMarketingCampaign"><security https="true" auth="true"/> - <event type="service" path="" invoke="removeRoleFromMarketingCampaign"/> - <response name="success" type="view" value="EditMarketingCampaignRoles"/> - <response name="error" type="view" value="EditMarketingCampaignRoles"/> - </request-map> <request-map uri="ListMarketingCampaignRoles"> <security https="true" auth="true"/> <response name="success" type="view" value="ListMarketingCampaignRoles"/> @@ -172,13 +162,7 @@ under the License. <request-map uri="createMarketingCampaignRole"> <security https="true" auth="true"/> <event type="service" invoke="createMarketingCampaignRole"/> - <response name="success" type="view" value="EditMarketingCampaignRoles"/> - <response name="error" type="view" value="EditMarketingCampaignRoles"/> - </request-map> - <request-map uri="updateMarketingCampaignRole"> - <security https="true" auth="true"/> - <event type="service" invoke="updateMarketingCampaignRole"/> - <response name="success" type="view" value="EditMarketingCampaignRoles"/> + <response name="success" type="view" value="ListMarketingCampaignRoles"/> <response name="error" type="view" value="EditMarketingCampaignRoles"/> </request-map> <request-map uri="removeMarketingCampaignRole"> Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml?rev=1292343&r1=1292342&r2=1292343&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml Wed Feb 22 15:26:39 2012 @@ -20,18 +20,16 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditMarketingCampaign" type="single" target="updateMarketingCampaign" title="" default-map-name="marketingCampaign" - header-row-style="header-row" default-table-style="basic-table"> + + <form name="EditMarketingCampaign" type="single" target="updateMarketingCampaign" title="" default-map-name="marketingCampaign"> <actions> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <alt-target use-when="marketingCampaign==null" target="createMarketingCampaign"/> <auto-fields-entity entity-name="MarketingCampaign"/> - <field use-when="marketingCampaign!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="marketingCampaign==null&&marketingCampaignId==null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><ignored/></field> <field use-when="marketingCampaign==null&&marketingCampaignId!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${marketingCampaignId}]"><display/></field> - <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}"> <drop-down allow-empty="true"> <entity-options description="${campaignName}" entity-name="MarketingCampaign" key-field-name="marketingCampaignId"> @@ -61,13 +59,12 @@ under the License. <field name="DONE_PAGE"> <hidden value="${donePage}"/> </field> - <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> - <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> + <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> </form> - <form name="ListMarketingCampaign" list-name="" target="" title="" type="list" paginate-target="listMarketingCampaign" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <form name="ListMarketingCampaign" type="list" paginate-target="listMarketingCampaign" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="MarketingCampaign"/> </actions> @@ -77,18 +74,14 @@ under the License. </hyperlink> </field> <field name="campaignName" title="${uiLabelMap.MarketingCampaignName}"><display/></field> - <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}"> - <display/> - </field> - <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeMarketingCampaign" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="marketingCampaignId"/> - </hyperlink> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> + <display-entity entity-name="StatusItem" description="${description}" also-hidden="true"/> </field> + <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}"><display/></field> </form> - <form name="ListMarketingCampaignRoles" list-name="" target="" title="" type="list" paginate-target="listMarketingCampaignGeo" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <form name="ListMarketingCampaignRoles" type="list" paginate-target="listMarketingCampaignGeo" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="MarketingCampaignRole"> <field-map field-name="marketingCampaignId" from-field="marketingCampaignId"/> @@ -120,13 +113,6 @@ under the License. </sub-hyperlink> </display-entity>--> </field> - <field name="editLink" title=" " widget-style="buttontext"> - <hyperlink target="EditMarketingCampaignRoles" description="${uiLabelMap.CommonEdit}" also-hidden="false"> - <parameter param-name="marketingCampaignId"/> - <parameter param-name="roleTypeId"/> - <parameter param-name="partyId"/> - </hyperlink> - </field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink target="removeMarketingCampaignRole" description="${uiLabelMap.CommonDelete}" also-hidden="false"> <parameter param-name="marketingCampaignId"/> @@ -136,15 +122,12 @@ under the License. </field> </form> - <form name="EditMarketingCampaignRoles" type="single" target="updateMarketingCampaignRole" title="" default-map-name="marketingCampaignRole" + <form name="EditMarketingCampaignRoles" type="single" target="createMarketingCampaignRole" title="" default-map-name="marketingCampaignRole" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="marketingCampaignRole==null" target="createMarketingCampaignRole"/> - <auto-fields-service service-name="updateMarketingCampaignRole"/> - + <auto-fields-service service-name="createMarketingCampaignRole"/> <field use-when="marketingCampaign!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="marketingCampaign==null&&marketingCampaignId==null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><ignored/></field> <field use-when="marketingCampaign==null&&marketingCampaignId!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${marketingCampaignId}]"><display/></field> - <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <lookup target-form-name="LookupPartyName"/> </field> @@ -155,7 +138,7 @@ under the License. </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> - <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"> + <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}"> <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> <parameter param-name="marketingCampaignId"/> </hyperlink> Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=1292343&r1=1292342&r2=1292343&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Wed Feb 22 15:26:39 2012 @@ -20,6 +20,7 @@ under the License. <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <screen name="CommonMarketingCampaignDecorator"> <section> <actions> @@ -63,130 +64,126 @@ under the License. </section> </screen> - <screen name="EditMarketingCampaign"> + <screen name="EditMarketingCampaign"> <section> <actions> - <property-map resource="OrderUiLabels" map-name="uiLabelMap"/> - <set field="titleProperty" value="PageTitleEditMarketingCampaign"/> - <set field="campaignTabButtonItem" value="MarketingCampaign"/> - <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/> - <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/> - <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" /> + <set field="titleProperty" value="PageTitleEditMarketingCampaign" /> + <set field="campaignTabButtonItem" value="MarketingCampaign" /> + <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign" /> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign" /> + <set field="marketingCampaignId" from-field="parameters.marketingCampaignId" /> + <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign" /> </actions> <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}" /> + </container> <section> <condition> - <not><if-empty field="marketingCampaign"/></not> + <not><if-empty field="marketingCampaign" /></not> </condition> <widgets> - <screenlet title="${uiLabelMap.PageTitleEditMarketingCampaign}"> - <container style="button-bar"> - <link text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign" style="buttontext create"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml"/> - </screenlet> + <container style="button-bar button-style-1"> + <link text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign" style="create"> + <parameter param-name="DONE_PAGE" from-field="donePage" /> + </link> + </container> </widgets> - <fail-widgets> - <screenlet title="${uiLabelMap.PageTitleAddMarketingCampaign}"> - <include-form name="EditMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml"/> - </screenlet> - </fail-widgets> </section> + <include-form name="EditMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml" /> </decorator-section> </decorator-screen> </widgets> </section> </screen> - <screen name="ListMarketingCampaign"> + <screen name="ListMarketingCampaign"> <section> <actions> - <set field="titleProperty" value="PageTitleListMarketingCampaign"/> - <set field="labelTitleProperty" value="PageTitleListMarketingCampaign"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindListMarketingCampaign"/> - <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/> - <set field="entityName" value="MarketingCampaign"/> + <set field="titleProperty" value="PageTitleListMarketingCampaign" /> + <set field="labelTitleProperty" value="PageTitleListMarketingCampaign" /> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign" /> + <set field="marketingCampaignId" from-field="parameters.marketingCampaignId" /> + <set field="entityName" value="MarketingCampaign" /> </actions> <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleListMarketingCampaign}"> - <container style="button-bar"> - <link text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign" style="buttontext create"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml"/> - </screenlet> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}" /> + </container> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign" style="buttontext create"> + <parameter param-name="DONE_PAGE" from-field="donePage" /> + </link> + </container> + <include-form name="ListMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml" /> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="EditMarketingCampaignRoles"> <section> <actions> - <set field="titleProperty" value="PageTitleEditMarketingCampaignRole"/> - <set field="campaignTabButtonItem" value="MarketingCampaignRole"/> - <set field="labelTitleProperty" value="PageTitleEditMarketingCampaignRole"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ListMarketingCampaignRoles"/> - <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/> - <set field="partyId" from-field="parameters.partyId"/> - <set field="roleTypeId" from-field="parameters.roleTypeId"/> - <set field="fromDate" from-field="parameters.fromDate"/> - <entity-one entity-name="MarketingCampaignRole" value-field="marketingCampaignRole"/> + <set field="titleProperty" value="MarketingCampaignRoleCreate" /> + <set field="campaignTabButtonItem" value="MarketingCampaignRole" /> + <set field="labelTitleProperty" value="PageTitleEditMarketingCampaignRole" /> + <set field="donePage" value="ListMarketingCampaignRoles" /> + <set field="marketingCampaignId" from-field="parameters.marketingCampaignId" /> + <set field="partyId" from-field="parameters.partyId" /> + <set field="roleTypeId" from-field="parameters.roleTypeId" /> + <set field="fromDate" from-field="parameters.fromDate" /> + <entity-one entity-name="MarketingCampaignRole" value-field="marketingCampaignRole" /> </actions> <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEditMarketingCampaignRole}"> - <container style="button-bar"> - <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="EditMarketingCampaignRoles" style="buttontext create"> - <parameter param-name="marketingCampaignId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditMarketingCampaignRoles" location="component://marketing/widget/MarketingCampaignForms.xml"/> - <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> - </screenlet> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}" /> + </container> + <include-form name="EditMarketingCampaignRoles" location="component://marketing/widget/MarketingCampaignForms.xml" /> + <!-- + <container> + <label style="h2" text="${uiLabelMap.CommonStatusHistory}" /> + </container> + --> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="ListMarketingCampaignRoles"> <section> <actions> - <set field="titleProperty" value="PageTitleListMarketingCampaignRole"/> - <set field="campaignTabButtonItem" value="MarketingCampaignRole"/> - <set field="labelTitleProperty" value="PageTitleListMarketingCampaignRole"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/> - <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/> + <set field="titleProperty" value="PageTitleListMarketingCampaignRole" /> + <set field="campaignTabButtonItem" value="MarketingCampaignRole" /> + <set field="labelTitleProperty" value="PageTitleListMarketingCampaignRole" /> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign" /> + <set field="marketingCampaignId" from-field="parameters.marketingCampaignId" /> </actions> <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleListMarketingCampaignRole}"> - <container style="button-bar"> - <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="EditMarketingCampaignRoles" style="buttontext create"> - <parameter param-name="marketingCampaignId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListMarketingCampaignRoles" location="component://marketing/widget/MarketingCampaignForms.xml"/> - </screenlet> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}" /> + </container> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="EditMarketingCampaignRoles" style="buttontext create"> + <parameter param-name="marketingCampaignId" /> + <parameter param-name="DONE_PAGE" from-field="donePage" /> + </link> + </container> + <include-form name="ListMarketingCampaignRoles" location="component://marketing/widget/MarketingCampaignForms.xml" /> </decorator-section> </decorator-screen> </widgets> </section> </screen> + </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |