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/05/21 04:19:15 UTC
svn commit: r776923 - in /ofbiz/branches/release09.04: ./
applications/party/widget/partymgr/CommunicationScreens.xml
specialpurpose/myportal/widget/CommonScreens.xml
Author: hansbak
Date: Thu May 21 02:19:14 2009
New Revision: 776923
URL: http://svn.apache.org/viewvc?rev=776923&view=rev
Log:
merge from trunk rev 776620 and 776630 fix display error 'commevents on a certain party'
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 21 02:19:14 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922
Modified: ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml?rev=776923&r1=776922&r2=776923&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml Thu May 21 02:19:14 2009
@@ -177,7 +177,7 @@
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="Common${parameters.my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="Common${my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-screen name="commOverview"/>
</decorator-section>
@@ -370,7 +370,7 @@
<script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
</actions>
<widgets>
- <decorator-screen name="Common${parameters.my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="Common${my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section><!-- Email -->
<condition>
@@ -473,7 +473,7 @@
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="Common${parameters.my}CommunicationEventDecorator"
+ <decorator-screen name="Common${my}CommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyEditCustomerRequest}">
Modified: ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml?rev=776923&r1=776922&r2=776923&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml Thu May 21 02:19:14 2009
@@ -96,16 +96,9 @@
<screen name="CommonCommunicationEventDecorator">
<section>
- <actions>
- <entity-one entity-name="CommunicationEvent" value-field="commEvent">
- <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
- </entity-one>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
- </actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonMyCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <!--include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="MyCommSubTabBar"/-->
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -119,7 +112,6 @@
<entity-one entity-name="CommunicationEvent" value-field="commEvent">
<field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
</entity-one>
- <!--script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/-->
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">