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/12 17:27:09 UTC
svn commit: r676186 - in /ofbiz/trunk/applications/party:
script/org/ofbiz/party/communication/ webapp/partymgr/WEB-INF/
webapp/partymgr/WEB-INF/actions/communication/
webapp/partymgr/communication/ widget/partymgr/
Author: hansbak
Date: Sat Jul 12 08:27:09 2008
New Revision: 676186
URL: http://svn.apache.org/viewvc?rev=676186&view=rev
Log:
add list if communicationevents originating from an unknown party and the possibility to create a new party from the notes field. (also converted spaces for tabs), standardize on buttonnamimg, added overview button.
Added:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy (with props)
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=676186&r1=676185&r2=676186&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Sat Jul 12 08:27:09 2008
@@ -214,6 +214,53 @@
<call-service service-name="sendCommEventAsEmail" in-map-name="inMap"/>
<transaction-commit/>
</iterate>
- </simple-method>
-
+ </simple-method>
+
+ <simple-method method-name="allocateMsgToParty" short-description="Allocate an emailaddress to an existing/new party, update the communication event accordingly">
+
+ <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+
+ <if-empty field="communicationEvent">
+ <add-error><fail-message message="Comminication Event ID: ${parameters.commnicationEventId}"/></add-error>
+ <check-errors/>
+ </if-empty>
+
+ <if-not-empty field="parameters.partyId">
+ <!-- allocate email to existing party -->
+ <entity-one entity-name="Party" value-name="party"/>
+ <if-empty field="party">
+ <add-error><fail-message message="Party ID: ${parameters.partyId} not found"/></add-error>
+ <check-errors/>
+ </if-empty>
+ <!-- add the email address to the party -->
+ <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+ <set field="newEmail.partyId" from-field="parameters.partyId"/>
+ <set field="newEmail.emailAddress" from-field="parameters.emailAddress"/>
+ <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
+ <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdFrom"/>
+ </call-service>
+ <field-to-list field-name="Email addres: ${parameters.emailAddress} allocated to party: ${parameters.partyId}" list-name="event_list"/>
+ <return/>
+ <else><!-- create new party and email address -->
+ <set-service-fields service-name="createPerson" map-name="parameters" to-map-name="newParty"/>
+ <call-service service-name="createPerson" in-map-name="newParty">
+ <result-to-field result-name="partyId" field-name="parameters.partyId"/>
+ </call-service>
+ <set field="newEmail.partyId" from-field="parameters.partyId"/>
+ <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+ <set field="newEmail.emailAddress" from-field="parameters.emailAddress"/>
+ <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
+ <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdFrom"/>
+ </call-service>
+ </else>
+ </if-not-empty>
+
+ <!-- update the communication event -->
+ <set field="inCom.communicationEventId" from-field="parameters.communicationEventId"/>
+ <set field="inCom.partyIdFrom" from-field="parameters.partyId"/>
+ <set field="inCom.statusId" value="COM_ENTERED"/>
+ <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
+
+ <field-to-request field-name="parmeters.communicationEventId" request-name="communicationEventId"/>
+ </simple-method>
</simple-methods>
Added: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy?rev=676186&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy Sat Jul 12 08:27:09 2008
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.base.util.*;
+import org.ofbiz.entity.util.EntityUtil;
+import javolution.util.FastList;
+
+communicationEvent = delegator.findOne("CommunicationEvent", [communicationEventId : parameters.communicationEventId], true);
+
+nameString = "Sent from: ";
+int startEmail = communicationEvent.note.indexOf(nameString) + nameString.length();
+int endEmail = communicationEvent.note.indexOf(";", startEmail);
+context.emailAddress = communicationEvent.note.substring(startEmail, endEmail-1);
+
+nameString = "Sent Name from: ";
+int startName = communicationEvent.note.indexOf(nameString) + nameString.length();
+int endName = communicationEvent.note.indexOf(";", startName);
+name = communicationEvent.note.substring(startName, endName);
+if (name) {
+ counter = 0;
+ lastBlank = 0;
+ List names = FastList.newInstance();
+ while ((nextBlank = name.indexOf(" ", lastBlank)) != -1) {
+ names.add(name.substring(lastBlank, nextBlank));
+ lastBlank = nextBlank + 1;
+ }
+ if (lastBlank > 0) {
+ names.add(name.substring(lastBlank));
+ }
+ if (names && names.size() > 0) { //lastname
+ context.lastName = names[names.size()-1];
+ if (names.size() > 1) { // firstname
+ context.firstName = names[0];
+ }
+ if (names.size() > 2) { // middle name(s)
+ context.middleName = "";
+ for (counter = 1; counter < names.size()-1; counter++) {
+ context.middleName = context.middleName.concat(names[counter]).concat(" ")
+ }
+ }
+ } else {
+ context.lastName = name;
+ }
+}
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=676186&r1=676185&r2=676186&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jul 12 08:27:09 2008
@@ -701,6 +701,13 @@
<response name="success" type="view" value="ListPartyCommEvents"/>
<response name="error" type="view" value="ListPartyCommEvents"/>
</request-map>
+
+ <request-map uri="allocateMsgToParty">
+ <security https="true" auth="true"/>
+ <event type="simple" path="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="allocateMsgToParty"/>
+ <response name="success" type="view" value="ViewCommunicationEvent"/>
+ <response name="error" type="view" value="ViewCommunicationEvent"/>
+ </request-map>
<request-map uri="createCommContentDataResource">
<security https="true" auth="true"/>
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=676186&r1=676185&r2=676186&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat Jul 12 08:27:09 2008
@@ -210,7 +210,7 @@
<field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
<field name="sendButton"><submit button-type="button"/></field>
</form>
- <form name="DisplayEmail" type="single" default-map-name="communicationEvent">
+ <form name="ViewEmail" type="single" default-map-name="communicationEvent">
<actions>
<entity-one entity-name="ContactMech" value-name="contactMechFrom">
<field-map field-name="contactMechId" env-name="communicationEvent.contactMechIdFrom"/>
@@ -341,7 +341,7 @@
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
- <form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true">
+ <form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true" list-name="commEvents">
<field name="communicationEventId"><hidden/></field>
<field name="subject">
<hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}"/>
@@ -371,10 +371,13 @@
<form name="ListPartyCommEvents" type="list" extends="ListCommEvents"
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="CommunicationEvent">
- <condition-list combine="or">
- <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>
- <condition-expr field-name="partyIdTo" operator="equals" value="${partyId}"/>
+ <entity-condition entity-name="CommunicationEvent" list-name="commEvents">
+ <condition-list combine="and">
+ <condition-expr env-name="" field-name="statusId" operator="not-equals" value="COM_PENDING"/>
+ <condition-list combine="or">
+ <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>
+ <condition-expr field-name="partyIdTo" operator="equals" value="${partyId}"/>
+ </condition-list>
</condition-list>
<order-by field-name="-lastUpdatedStamp"/>
</entity-condition>
@@ -386,7 +389,7 @@
<form name="ListPendingCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="CommunicationEvent">
+ <entity-condition entity-name="CommunicationEvent" list-name="commEvents">
<condition-list combine="and">
<condition-list combine="or">
<condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>
@@ -400,7 +403,7 @@
<form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent">
<actions>
- <entity-condition entity-name="CommunicationEvent">
+ <entity-condition entity-name="CommunicationEvent" list-name="commEvents">
<condition-list combine="or">
<condition-expr field-name="parentCommEventId" operator="equals" value="${communicationEventId}"/>
<condition-expr field-name="origCommEventId" operator="equals" value="${communicationEventId}"/>
@@ -657,4 +660,56 @@
<field name="textData" map-name="electronicText" title="Text Data"><textarea rows="30" cols="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
+
+ <form name="ListUnknownPartyEmails" type="multi" use-row-submit="true"
+ title="Email List" list-name="commEventsUnknown"
+ default-widget-style="tabletext" default-tooltip-style="tabletext"
+ target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&delContentDataResource=Y"
+ default-entity-name="CommunicationEvent"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <field name="communicationEventId">
+ <hidden />
+ </field>
+ <field name="subject" widget-style="buttontext"
+ widget-area-style="fieldWidth300">
+ <hyperlink description="${subject}"
+ target="ViewCommunicationEvent?communicationEventId=${communicationEventId}" />
+ </field>
+ <field name="entryDate">
+ <display description="${bsh:entryDate.toString().substring(0,16)}" />
+ </field>
+ <!--
+ field name="statusId"><display-entity entity-name="StatusItem"
+ description="${description}"/></field
+ -->
+ <field name="note" widget-area-style="fieldWidth200">
+ <display />
+ </field>
+ <!--
+ field name="delete" widget-style="buttontext"><hyperlink
+ description="delete"
+ target="deleteCommunicationEvent?communicationEventId=${communicationEventId}&delContentDataResource=Y"/></field
+ -->
+ <field name="_rowSubmit" title="&nbsp;">
+ <check />
+ </field>
+ <field name="deleteSelectedButton" widget-style="smallSubmit">
+ <submit />
+ </field>
+ </form>
+
+ <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title="create a new party for a unknown incoming email address"
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" default-map-name="context">
+ <actions>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy"/>
+ </actions>
+ <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
+ <field name="partyId" tooltip="leave empty for new 'Party'" position="1"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="emailAddress" position="2" use-when="communicationEvent.get("partyIdFrom")==null"><text default-value="${fromEmail}"/></field>
+ <field name="firstName" position="1"><text/></field>
+ <field name="middleName" position="2"><text default-value="${toEmail}"/></field>
+ <field name="lastName" position="3"><text default-value="${toEmail}"/></field>
+ <field name="submit" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
</forms>
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=676186&r1=676185&r2=676186&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Sat Jul 12 08:27:09 2008
@@ -18,22 +18,25 @@
under the License.
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
- <menu name="CommEventTabBar" default-selected-style="selected" type="simple"
- menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="subTabButtonItem">
+ <menu name="CommEventTabBar" default-selected-style="selected" type="simple"
+ menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
+ <link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
+ </menu-item>
<menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
- <link target="EditCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
+ <link target="EditCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommPurposes" title="${uiLabelMap.PartyEventPurpose}">
- <link target="UpdateCommPurposes?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
+ <link target="UpdateCommPurposes?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommRoles" title="${uiLabelMap.PartyRoles}">
- <link target="UpdateCommRoles?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
+ <link target="UpdateCommRoles?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommWorkEfforts" title="${uiLabelMap.PartyCommWorkEfforts}">
- <link target="ListCommWorkEfforts?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
+ <link target="ListCommWorkEfforts?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommContent" title="${uiLabelMap.CommonContent}">
- <link target="ListCommContent?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
+ <link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<!-- TODO!
<menu-item name="ListCommCustRequests" title="CustRequests">
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=676186&r1=676185&r2=676186&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sat Jul 12 08:27:09 2008
@@ -141,21 +141,12 @@
</widgets>
</section>
</screen>
- <screen name="ViewCommunicationEvent">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleViewCommunication" />
- <set field="tabButtonItem" value="PartyCommEvents" />
- <set field="subTabButtonItem" value="CommunicationEvent" />
- <set field="communicationEventId" from-field="parameters.communicationEventId" />
- <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <set default-value="" field="partyId" value="${parameters.partyId}" />
- <set default-value="${userLogin.partyId}" field="partyIdFrom"
- value="${parameters.partyId}" />
- <set default-value="${userLogin.partyId}" field="partyIdTo"
- value="${parameters.partyId}" />
- <entity-one entity-name="Party" value-name="party"/>
- <entity-one entity-name="Person" value-name="lookupPerson"/>
+ <screen name="ViewCommunicationEvent">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewCommunication" />
+ <set field="tabButtonItem" value="OverView"/>
+ <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
<entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
<entity-one entity-name="CommunicationEvent" value-name="parentEvent" auto-field-map="false">
<field-map env-name="parentCommEventId" field-name="communicationEventId"/>
@@ -176,42 +167,57 @@
<entity-one entity-name="RoleType" value-name="toRoleType">
<field-map env-name="communicationEvent.roleTypeIdTo" field-name="roleTypeId"/>
</entity-one>
- </actions>
- <widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <or>
- <if-compare field-name="communicationEvent.communicationEventTypeId"
- operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="communicationEvent.communicationEventTypeId"
- operator="equals" value="AUTO_EMAIL_COMM" />
- </or>
- </condition>
- <widgets>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCommunicationEventDecorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <or><!-- have for e-mails a special form -->
+ <if-compare field-name="communicationEvent.communicationEventTypeId"
+ operator="equals" value="EMAIL_COMMUNICATION" />
+ <if-compare field-name="communicationEvent.communicationEventTypeId"
+ operator="equals" value="AUTO_EMAIL_COMM" />
+ </or>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <if-empty field-name="communicationEvent.partyIdFrom"/>
+ </condition>
+ <widgets>
+ <screenlet>
+ <container>
+ <label style="h1" text="Origin Email address not known!"/>
+ </container>
+ <container>
+ <label style="h2" text="Allocate this message to a existing or new party and add an email address"/>
+ </container>
+ <include-form name="allocateMsgToPartyForm" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="DisplayEmail" />
- </widgets>
- <fail-widgets>
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewCommEvent" />
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+ name="ViewEmail" />
+ </widgets>
+ <fail-widgets>
+ <include-form
+ location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ViewCommEvent" />
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditCommunicationEvent">
<section>
<actions>
<set field="titleProperty" value="PageTitleEditCommunication"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="CommunicationEvent"/>
+ <set field="tabButtonItem" value="CommunicationEvent"/>
<set field="entityName" value="CommunicationEvent"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
@@ -265,8 +271,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditCommunication"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="CommunicationEvent"/>
+ <set field="tabButtonItem" value="CommunicationEvent"/>
<set field="entityName" value="CommunicationEvent"/>
<set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
@@ -298,8 +303,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditCommunication"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="CommunicationEvent"/>
+ <set field="tabButtonItem" value="CommunicationEvent"/>
<set field="entityName" value="CommunicationEvent"/>
<set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
@@ -328,8 +332,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleViewCommRoles"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="UpdateCommRoles"/>
+ <set field="tabButtonItem" value="UpdateCommRoles"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
@@ -394,8 +397,7 @@
<actions>
<property-map map-name="uiLabelMap" resource="PartyUiLabels"/>
<set field="titleProperty" value="PageTitleViewCommPurposes"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="UpdateCommPurposes"/>
+ <set field="tabButtonItem" value="UpdateCommPurposes"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
@@ -459,8 +461,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleListCommWorkEfforts"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="UpdateCommWorkEfforts"/>
+ <set field="tabButtonItem" value="UpdateCommWorkEfforts"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<set field="partyId" value="${parameters.partyId}"/>
@@ -504,8 +505,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleListCommWorkEfforts"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="UpdateCommWorkEfforts"/>
+ <set field="tabButtonItem" value="UpdateCommWorkEfforts"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
@@ -538,8 +538,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleListCommWorkEfforts"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="UpdateCommWorkEfforts"/>
+ <set field="tabButtonItem" value="UpdateCommWorkEfforts"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
@@ -571,8 +570,7 @@
<actions>
<set field="titleProperty" value="PartyCommContent"/>
<set field="headerItem" value="comm"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="CommContent"/>
+ <set field="tabButtonItem" value="CommContent"/>
<set field="partyId" value="${parameters.partyId}"/>
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>
@@ -612,8 +610,7 @@
<actions>
<set field="titleProperty" value="PartyNewCommContent"/>
<set field="headerItem" value="comm"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="CommContent"/>
+ <set field="tabButtonItem" value="CommContent"/>
<set field="partyId" from-field="parameters.partyId"/>
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>
@@ -644,8 +641,7 @@
<actions>
<set field="titleProperty" value="PageTitleCommEvents"/>
<set field="headerItem" value="comm"/>
- <set field="tabButtonItem" value="PartyCommEvents"/>
- <set field="subTabButtonItem" value="CommContent"/>
+ <set field="tabButtonItem" value="CommContent"/>
<set field="partyId" value="${parameters.partyId}"/>
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>