Author: hansbak
Date: Sat May 30 05:32:39 2009
New Revision: 780181
URL: http://svn.apache.org/viewvc?rev=780181&view=rev
Log:
Applied fix from trunk for revision: 780180
corrected r780111: showing communicationevent for a certain party
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/party/config/PartyHelpUrls.xml
ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 30 05:32:39 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,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779639,780111,780138
+/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,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779639,779873,780111,780138,780180
Modified:
ofbiz/branches/release09.04/applications/party/config/PartyHelpUrls.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/config/PartyHelpUrls.xml?rev=780181&r1=780180&r2=780181&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/config/PartyHelpUrls.xml
(original)
+++ ofbiz/branches/release09.04/applications/party/config/PartyHelpUrls.xml Sat
May 30 05:32:39 2009
@@ -19,29 +19,32 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <property key="PARTY_main">
+ <value xml:lang="en">Party</value>
+ </property>
<property key="PARTY_findparty">
- <value xml:lang="en">Parties</value>
+ <value xml:lang="en">Party</value>
</property>
<property key="PARTY_FindCommunicationEvents">
- <value xml:lang="en">Communications</value>
+ <value xml:lang="en">Party Communications</value>
</property>
<property key="PARTY_showvisits">
- <value xml:lang="en">Visits</value>
+ <value xml:lang="en">Party Visits</value>
</property>
<property key="PARTY_FindPartyClassificationGroups">
- <value xml:lang="en">Classifications</value>
+ <value xml:lang="en">Party Classifications</value>
</property>
<property key="PARTY_FindSecurityGroup">
- <value xml:lang="en">Security</value>
+ <value xml:lang="en">Party Security</value>
</property>
<property key="PARTY_AddressMatchMap">
- <value xml:lang="en">Address Match Map</value>
+ <value xml:lang="en">Party Address Match Map</value>
</property>
<property key="PARTY_partyInvitation">
- <value xml:lang="en">Invitation</value>
+ <value xml:lang="en">Party Invitation</value>
</property>
<property key="PARTY_CreateNewParty">
- <value xml:lang="en">Create new party</value>
+ <value xml:lang="en">Party new</value>
</property>
</resource>
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=780181&r1=780180&r2=780181&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml
(original)
+++
ofbiz/branches/release09.04/applications/party/widget/partymgr/CommunicationScreens.xml
Sat May 30 05:32:39 2009
@@ -177,11 +177,25 @@
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-screen name="commOverview"/>
- </decorator-section>
- </decorator-screen>
+ <section>
+ <condition>
+ <if-empty field="parameters.my"/>
+ </condition>
+ <widgets>
+ <decorator-screen
name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-screen name="commOverview"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ <fail-widgets>
+ <decorator-screen
name="CommonMyCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-screen name="commOverview"/>
+ </decorator-section>
+ </decorator-screen>
+ </fail-widgets>
+ </section>
</widgets>
</section>
</screen>
