You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/01 00:56:21 UTC
svn commit: r760711 - in /ofbiz/trunk/applications:
content/widget/compdoc/CompDocScreens.xml
marketing/widget/ContactListScreens.xml
marketing/widget/MarketingCampaignScreens.xml
Author: jleroux
Date: Tue Mar 31 22:56:21 2009
New Revision: 760711
URL: http://svn.apache.org/viewvc?rev=760711&view=rev
Log:
Fix bugs from previous commits
Modified:
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=760711&r1=760710&r2=760711&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Tue Mar 31 22:56:21 2009
@@ -782,7 +782,7 @@
<!-- link on form
<container>
<link target="EditSurvey" text="${uiLabelMap.PageTitleViewCompDocContent}" style="buttontext">
- <parameter param-name="surveyId from-field="dataResource.relatedDetailId&rootContentId/>
+ <parameter param-name="surveyId from-field="dataResource.relatedDetailId"/>
<parameter param-name="rootContentId"/>
</link>
</container>
Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=760711&r1=760710&r2=760711&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Tue Mar 31 22:56:21 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
<screen name="FindContactLists">
@@ -110,7 +110,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="ListContactLists">
<section>
<actions>
@@ -183,11 +183,12 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" DONE_PAGE>
- <parameter param-name="contactListId" from-field="contactListId"/>
+ <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty">
+ <parameter param-name="contactListId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
<container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container>
<iterate-section entry="contactListPartyStatus" list="contactListPartyStatusList">
<section>
@@ -199,13 +200,13 @@
</widgets>
</section>
</container>
- </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
+
<screen name="ListContactListParties">
<section>
<actions>
@@ -233,8 +234,9 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" DONE_PAGE>
- <parameter param-name="contactListId" from-field="contactListId"/>
+ <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty">
+ <parameter param-name="contactListId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
@@ -270,8 +272,9 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" DONE_PAGE>
- <parameter param-name="contactListId" from-field="contactListId"/>
+ <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty">
+ <parameter param-name="contactListId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
@@ -284,7 +287,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="EditContactListCommEvent">
<section>
<actions>
@@ -296,7 +299,7 @@
<set field="contactListId" from-field="parameters.contactListId"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
-
+
<!-- get the current log in user's default email -->
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
</actions>
@@ -313,15 +316,16 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" DONE_PAGE>
- <parameter param-name="contactListId" from-field="contactListId"/>
+ <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent">
+ <parameter param-name="contactListId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</widgets>
</section>
</container>
- </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -354,8 +358,9 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" DONE_PAGE>
- <parameter param-name="contactListId" from-field="contactListId"/>
+ <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent">
+ <parameter param-name="contactListId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
@@ -391,8 +396,9 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" DONE_PAGE>
- <parameter param-name="contactListId" from-field="contactListId"/>
+ <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent">
+ <parameter param-name="contactListId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=760711&r1=760710&r2=760711&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Tue Mar 31 22:56:21 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
<screen name="CommonMarketingCampaignDecorator">
<section>
@@ -55,7 +55,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="EditMarketingCampaign">
<section>
<actions>
@@ -106,7 +106,7 @@
</widgets>
</section>
</container>
- </container>
+ </container>
</fail-widgets>
</section>
</decorator-section>
@@ -114,13 +114,13 @@
</widgets>
</section>
</screen>
-
+
<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"/>
@@ -175,8 +175,9 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles" DONE_PAGE>
- <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/>
+ <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles">
+ <parameter param-name="marketingCampaignId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
@@ -213,18 +214,19 @@
<section>
<widgets>
<container>
- <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles" DONE_PAGE>
- <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/>
+ <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles">
+ <parameter param-name="marketingCampaignId"/>
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
<include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
</widgets>
</section>
</container>
- </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>