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 2008/07/15 14:08:08 UTC
svn commit: r676892 - in /ofbiz/trunk:
applications/party/config/PartyUiLabels.xml
applications/party/webapp/partymgr/communication/CommMenus.xml
specialpurpose/mypage/widget/MyPageForms.xml
Author: hansbak
Date: Tue Jul 15 05:08:07 2008
New Revision: 676892
URL: http://svn.apache.org/viewvc?rev=676892&view=rev
Log:
fixed some errors in communication events party/mypage
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=676892&r1=676891&r2=676892&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Jul 15 05:08:07 2008
@@ -171,7 +171,7 @@
<value xml:lang="zh">æè¿°</value>
</property>
<property key="EmailfromUnknownParties">
- <value xml:lang="en">Email unknown parties</value>
+ <value xml:lang="en">Email from unknown parties</value>
</property>
<property key="FormFieldTitle_attrName">
<value xml:lang="en">Attr Name</value>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=676892&r1=676891&r2=676892&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Tue Jul 15 05:08:07 2008
@@ -25,27 +25,27 @@
<link target="FindCommunicationEvents"/>
</menu-item>
<menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
- <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
<link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
- <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
<link target="EditCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommPurposes" title="${uiLabelMap.PartyEventPurpose}">
- <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
<link target="UpdateCommPurposes?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommRoles" title="${uiLabelMap.PartyRoles}">
- <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
<link target="UpdateCommRoles?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommWorkEfforts" title="${uiLabelMap.PartyCommWorkEfforts}">
- <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
<link target="ListCommWorkEfforts?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommContent" title="${uiLabelMap.CommonContent}">
- <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
<link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<!-- TODO!
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=676892&r1=676891&r2=676892&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Tue Jul 15 05:08:07 2008
@@ -102,6 +102,15 @@
<field use-when="headerItem.equals("otherCommunications")" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventOthers?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</field>
+ <field use-when="headerItem.equals("main")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+ <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=main"/>
+ </field>
+ <field use-when="headerItem.equals("myCommunications")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+ <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=my" />
+ </field>
+ <field use-when="headerItem.equals("otherCommunications")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+ <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=other" />
+ </field>
</form>
<form name="ListMyUnknownPartyEmails"
extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"