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:38:32 UTC
svn commit: r760701 - in /ofbiz/trunk/applications:
marketing/widget/ContactListScreens.xml
marketing/widget/MarketingCampaignScreens.xml
party/widget/partymgr/CommunicationScreens.xml
Author: jleroux
Date: Tue Mar 31 22:38:32 2009
New Revision: 760701
URL: http://svn.apache.org/viewvc?rev=760701&view=rev
Log:
Securing URLs, link element in screens and menus : 9th set + tabs to 4 spaces
Modified:
ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=760701&r1=760700&r2=760701&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Tue Mar 31 22:38:32 2009
@@ -182,7 +182,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" DONE_PAGE>
+ <parameter param-name="contactListId" from-field="contactListId"/>
+ </link>
+ </container>
<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">
@@ -228,7 +232,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" DONE_PAGE>
+ <parameter param-name="contactListId" from-field="contactListId"/>
+ </link>
+ </container>
<include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</widgets>
</section>
@@ -261,7 +269,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" DONE_PAGE>
+ <parameter param-name="contactListId" from-field="contactListId"/>
+ </link>
+ </container>
<include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</widgets>
</section>
@@ -300,7 +312,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" DONE_PAGE>
+ <parameter param-name="contactListId" from-field="contactListId"/>
+ </link>
+ </container>
<include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</widgets>
</section>
@@ -337,7 +353,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" DONE_PAGE>
+ <parameter param-name="contactListId" from-field="contactListId"/>
+ </link>
+ </container>
<include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</widgets>
</section>
@@ -370,7 +390,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" DONE_PAGE>
+ <parameter param-name="contactListId" from-field="contactListId"/>
+ </link>
+ </container>
<include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</widgets>
</section>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=760701&r1=760700&r2=760701&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Tue Mar 31 22:38:32 2009
@@ -174,7 +174,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles" DONE_PAGE>
+ <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/>
+ </link>
+ </container>
<include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
<container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container>
</widgets>
@@ -208,7 +212,11 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles" DONE_PAGE>
+ <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/>
+ </link>
+ </container>
<include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
</widgets>
</section>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=760701&r1=760700&r2=760701&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Tue Mar 31 22:38:32 2009
@@ -307,8 +307,8 @@
</entity-condition>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<set field="communicationEventTypeId" from-field="parameters.communicationEventTypeId"/>
- <set field="partyId" from-field="userLogin.partyId"/>
- </actions>
+ <set field="partyId" from-field="userLogin.partyId"/>
+ </actions>
<widgets>
<screenlet title="${uiLabelMap.PartyAttachContent}">
<platform-specific>
@@ -317,9 +317,9 @@
</html>
</platform-specific>
</screenlet>
- </widgets>
+ </widgets>
</section>
- </screen>
+ </screen>
<screen name="AttachFileList">
<section>
<actions>
@@ -527,7 +527,12 @@
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommEventPurposes}">
- <container style="button-bar"><link style="smallSubmit" target="AddCommContent?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyNewCommPurpose}"/></container>
+ <container style="button-bar">
+ <link style="smallSubmit" target="AddCommContent" text="${uiLabelMap.PartyNewCommPurpose}">
+ <parameter param-name="communicationEventId"/>
+ <parameter param-name="partyId"/>
+ </link>
+ </container>
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommPurposes"/>
</screenlet>
</decorator-section>
@@ -553,7 +558,12 @@
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommWorkEfforts}">
- <container style="button-bar"><link style="smallSubmit" target="AddCommEventWorkEffort?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyNewCommWorkEffort}"/></container>
+ <container style="button-bar">
+ <link style="smallSubmit" target="AddCommEventWorkEffort">
+ <parameter param-name="communicationEventId"/>
+ <parameter param-name="partyId"/>
+ </link>
+ </container>
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommWorkEfforts"/>
</screenlet>
</decorator-section>
@@ -623,7 +633,12 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.PartyCommContent}">
- <container style="button-bar"><link style="smallSubmit" target="AddCommContent?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyAddCommContent}"/></container>
+ <container style="button-bar">
+ <link style="smallSubmit" target="AddCommContent">
+ <parameter param-name="communicationEventId"/>
+ <parameter param-name="partyId"/>
+ </link>
+ </container>
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
</screenlet>
</widgets>
@@ -764,7 +779,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="PartyCommunicationEvents">
<section>
<actions>
@@ -815,10 +830,10 @@
</entity-condition>
<entity-condition entity-name="CommunicationEventAndRole" list="commEventDraft">
<condition-list combine="and">
- <condition-expr field-name="statusId" operator="equals"
+ <condition-expr field-name="statusId" operator="equals"
value="COM_PENDING"/>
- <condition-expr field-name="partyId" operator="equals"
- value="${partyId}"/>
+ <condition-expr field-name="partyId" operator="equals"
+ value="${partyId}"/>
</condition-list>
<order-by field-name="-datetimeStarted" />
</entity-condition>