Author: hansbak
Date: Tue Jun 23 09:42:19 2009
New Revision: 787606
URL: http://svn.apache.org/viewvc?rev=787606&view=rev
Log:
small corrections to the view communication event screens
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=787606&r1=787605&r2=787606&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Tue Jun 23 09:42:19 2009
@@ -240,12 +240,18 @@
<field name="datetimeEnded"
title="${uiLabelMap.CommonEndDate}"><display type="date"/></field>
<field name="subject"><display/></field>
<field name="content"
title="${uiLabelMap.CommonContent}"><display/></field>
+ <field name="parentCommEventId">
+ <hyperlink description="${communicationEvent.parentCommEventId}"
target="ViewCommunicationEvent">
+ <parameter param-name="communicationEventId"
from-field="communicationEvent.parentCommEventId"/>
+ </hyperlink>
+ </field>
<field name="note" title="${uiLabelMap.CommonNote}"><display/></field>
<sort-order>
<field-group collapsible="false" initially-collapsed="false">
<sort-field name="communicationEventId"/>
<sort-field name="communicationEventTypeId"/>
+ <sort-field name="parentCommEventId"/>
<sort-field name="contactListId"/>
<sort-field name="messageId"/>
<sort-field name="partyIdFrom"/>
@@ -256,7 +262,7 @@
<sort-field name="datetimeEnded"/>
<sort-field name="subject"/>
</field-group>
- <field-group title="${uiLabelMap.CommonContent}"
collapsible="true" initially-collapsed="true">
+ <field-group title="${uiLabelMap.CommonContent}"
collapsible="true" initially-collapsed="false">
<sort-field name="content"/>
<sort-field name="note"/>
</field-group>
@@ -310,7 +316,7 @@
<sort-field name="datetimeEnded"/>
<sort-field name="subject"/>
</field-group>
- <field-group title="${uiLabelMap.CommonContent}"
collapsible="true" initially-collapsed="true">
+ <field-group title="${uiLabelMap.CommonContent}"
collapsible="true" initially-collapsed="false">
<sort-field name="contentMimeTypeId"/>
<sort-field name="content"/>
<sort-field name="note"/>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=787606&r1=787605&r2=787606&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Tue
Jun 23 09:42:19 2009
@@ -211,22 +211,6 @@
<include-screen name="commEvent"
location="component://party/widget/partymgr/CommunicationScreens.xml"/>
</widgets>
</section>
- <section>
- <condition>
- <not>
- <if-empty
field="communicationEvent.parentCommEventId"/>
- </not>
- </condition>
- <actions>
- <set field="parent"
value="${uiLabelMap.CommonParent}"/>
- <entity-one entity-name="CommunicationEvent"
value-field="communicationEvent">
- <field-map field-name="communicationEventId"
from-field="communicationEvent.parentCommEventId"/>
- </entity-one>
- </actions>
- <widgets>
- <include-screen name="commEvent"
location="component://party/widget/partymgr/CommunicationScreens.xml"/>
- </widgets>
- </section>
</container>
<container style="righthalf">
<label style="h1"
text="${uiLabelMap.CommonRelatedInformation}"/>
@@ -317,14 +301,12 @@
</screenlet>
</widgets>
</section>
- <include-form
-
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewEmail"/>
+ <include-form name="ViewEmail"
+
location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</widgets>
<fail-widgets>
- <include-form
-
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewCommEvent"/>
+ <include-form name="ViewCommEvent"
+
location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</fail-widgets>
</section>
</screenlet>
