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/03/26 07:06:33 UTC
svn commit: r758522 [3/3] - in /ofbiz/trunk: applications/party/config/
applications/party/data/
applications/party/script/org/ofbiz/party/communication/
applications/party/webapp/partymgr/WEB-INF/
applications/party/webapp/partymgr/WEB-INF/actions/com...
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=758522&r1=758521&r2=758522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Thu Mar 26 06:06:12 2009
@@ -20,42 +20,6 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
- <simple-method method-name="updatePreferences" short-description="Update the user preferences">
- <if-compare operator="equals" value="Y" field="parameters.myCompanyComms">
- <set field="parameters.userPrefMap.myCompanyComms" value="Y"/>
- <else>
- <set field="parameters.userPrefMap.myCompanyComms" value="N"/>
- </else>
- </if-compare>
- <if-compare operator="equals" value="Y" field="parameters.myTimesheet">
- <set field="parameters.userPrefMap.myTimesheet" value="Y"/>
- <else>
- <set field="parameters.userPrefMap.myTimesheet" value="N"/>
- </else>
- </if-compare>
- <if-compare operator="equals" value="Y" field="parameters.myTasks">
- <set field="parameters.userPrefMap.myTasks" value="Y"/>
- <else>
- <set field="parameters.userPrefMap.myTasks" value="N"/>
- </else>
- </if-compare>
- <if-compare operator="equals" value="Y" field="parameters.myCommunications">
- <set field="parameters.userPrefMap.myCommunications" value="Y"/>
- <else>
- <set field="parameters.userPrefMap.myCommunications" value="N"/>
- </else>
- </if-compare>
- <if-compare operator="equals" value="Y" field="parameters.otherCommunications">
- <set field="parameters.userPrefMap.otherCommunications" value="Y"/>
- <else>
- <set field="parameters.userPrefMap.otherCommunications" value="N"/>
- </else>
- </if-compare>
- <set-service-fields service-name="setUserPreferenceGroup" map="parameters"
- to-map="inMap"/>
- <call-service service-name="setUserPreferenceGroup" in-map-name="inMap"/>
- </simple-method>
-
<simple-method method-name="updateCustPreferences"
short-description="Update the customer preferences">
<if-compare operator="equals" value="Y" field="parameters.sendCustRequestEmail">
@@ -69,50 +33,6 @@
<call-service service-name="setUserPreferenceGroup" in-map-name="inMap"/>
</simple-method>
- <simple-method method-name="setCommEventToRead" short-description="">
- <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
- <if-compare operator="equals" value="COM_ROLE_CREATED" field="eventRole.statusId">
- <call-simple-method method-name="checkCommEventAccess"/>
- <if-compare operator="equals" value="true" field="found">
- <entity-one entity-name="UserLogin" value-field="userLogin">
- <field-map field-name="userLoginId" value="system"/>
- </entity-one>
- <set-service-fields service-name="setCommunicationEventRoleStatus"
- map="parameters" to-map="updStat"/>
- <set field="updStat.statusId" value="COM_ROLE_READ"/>
- <set field="updStat.userLogin" from-field="userLogin"/>
- <call-service service-name="setCommunicationEventRoleStatus" in-map-name="updStat"
- include-user-login="false"/>
- <else>
- <add-error>
- <fail-property property="MyPortalNoAccess" resource="MyPortalUiLabels"/>
- </add-error>
- </else>
- </if-compare>
- </if-compare>
- </simple-method>
-
- <simple-method method-name="checkCommEventAccess"
- short-description="check if the user has access to the email of this party">
- <set field="found" value="false"/>
- <if-compare-field operator="not-equals" field="parameters.partyId"
- to-field="userLogin.partyId">
- <entity-and list="emailOwners" entity-name="PartyRelationship"
- filter-by-date="true">
- <field-map field-name="partyIdFrom" value="${userLogin.partyId}"/>
- <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN"/>
- </entity-and>
- <iterate entry="emailOwners" list="emailOwner">
- <if-compare operator="equals" value="${userLogin.partyId}"
- field="emailOwner.partyIdTo">
- <set field="found" value="true"/>
- </if-compare>
- </iterate>
- <else>
- <set field="found" value="true"/>
- </else>
- </if-compare-field>
- </simple-method>
<simple-method method-name="createCommunicationEventRoles" short-description="">
<entity-condition list="commEvents" entity-name="CommunicationEvent"/>
<set field="count" value="0" type="Integer"/>
@@ -182,133 +102,6 @@
</if-not-empty>
</simple-method>
- <simple-method method-name="createCommunicationContent"
- short-description="Upload Content and Create Communication Content Association">
- <!-- Call layout to get field -->
- <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
- method-name="uploadImageAndParameters" ret-field="formInput">
- <field field="request" type="javax.servlet.http.HttpServletRequest"/>
- <string value="uploadedFile"/>
- </call-class-method>
- <set field="parameters.imageFileName" from-field="formInput.imageFileName"/>
-
- <!-- Call bsh get file type -->
- <call-bsh><![CDATA[
- String fileName = parameters.get("imageFileName");
- String mimeTypeId = fileName.substring(fileName.indexOf(".")+1,fileName.length());
- parameters.put("mimeType",mimeTypeId);
- ]]>
- </call-bsh>
-
- <!-- Get mime type from FileExtention -->
- <set field="fileMap.fileExtensionId" value="${parameters.mimeType}"/>
- <find-by-primary-key map="fileMap" value-field="mimeType" entity-name="FileExtension"/>
-
- <!-- Create Data Resource -->
- <set-service-fields service-name="createContentFromUploadedFile"
- map="formInput.formInput" to-map="data"/>
- <set field="data.dataResourceTypeId" value="LOCAL_FILE"/>
- <set field="data.dataTemplateTypeId" value="NONE"/>
- <set field="data.dataCategoryId" from-field="formInput.formInput.dataCategoryId"/>
-
- <set field="data.statusId" from-field="formInput.formInput.statusId"/>
- <set field="data.dataResourceName" from-field="formInput.imageFileName"/>
- <set field="data.mimeTypeId" from-field="mimeType.mimeTypeId"/>
- <set field="data.uploadedFile" from-field="formInput.imageData"/>
- <set field="data._uploadedFile_fileName" from-field="formInput.imageFileName"/>
- <set field="data._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
- <call-service service-name="createDataResource" in-map-name="data">
- <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
- </call-service>
- <log level="always" message=" DataResource : ${parameters.dataResourceId}"/>
-
- <!-- Create attach upload to data resource -->
- <set-service-fields service-name="attachUploadToDataResource" map="formInput.formInput"
- to-map="attachMap"/>
- <set field="attachMap.uploadedFile" from-field="formInput.imageData"/>
- <set field="attachMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
- <set field="attachMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
- <set field="attachMap.dataResourceId" from-field="parameters.dataResourceId"/>
- <set field="attachMap.mimeTypeId" from-field="mimeType.mimeTypeId"/>
- <call-service service-name="attachUploadToDataResource" in-map-name="attachMap"/>
-
- <!-- Create content from dataResource -->
- <set-service-fields service-name="createContentFromDataResource"
- map="formInput.formInput" to-map="contentMap"/>
- <set field="contentMap.roleTypeId" from-field="formInput.formInput.roleTypeId"/>
- <set field="contentMap.partyId" from-field="formInput.formInput.partyId"/>
- <set field="contentMap.contentTypeId" from-field="formInput.formInput.contentTypeId"/>
- <set field="contentMap.dataResourceId" from-field="parameters.dataResourceId"/>
- <call-service service-name="createContentFromDataResource" in-map-name="contentMap">
- <result-to-field result-name="contentId" field="parameters.contentId"/>
- </call-service>
- <log level="always" message=" Content : ${parameters.contentId}"/>
-
- <!-- Create party content -->
- <set-service-fields service-name="createPartyContent" map="formInput.formInput"
- to-map="partycontent"/>
- <set field="partycontent.contentId" from-field="parameters.contentId"/>
- <set field="partycontent.partyContentTypeId"
- from-field="formInput.formInput.partyContentTypeId"/>
- <set field="partycontent.partyId" from-field="formInput.formInput.partyId"/>
- <call-service service-name="createPartyContent" in-map-name="partycontent"/>
-
- <!-- Create communication event and content association -->
- <set-service-fields service-name="createCommEventContentAssoc"
- map="formInput.formInput" to-map="contentAssoc"/>
- <set field="contentAssoc.contentId" from-field="parameters.contentId"/>
- <set field="contentAssoc.communicationEventId"
- from-field="formInput.formInput.communicationEventId"/>
- <call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc">
- <result-to-field result-name="fromDate" field="fromDate"/>
- </call-service>
-
- <!-- Return to request -->
- <set field="communicationEventTypeId"
- from-field="formInput.formInput.communicationEventTypeId"/>
- <set field="communicationEventId" from-field="formInput.formInput.communicationEventId"/>
- <field-to-request field="communicationEventId" request-name="communicationEventId"/>
- <field-to-request field="communicationEventTypeId"
- request-name="communicationEventTypeId"/>
-
- </simple-method>
-
- <simple-method method-name="addContentToCommEvent"
- short-description="Add content to email communication">
- <!-- Call layout to get field -->
- <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
- method-name="uploadImageAndParameters" ret-field="formInput">
- <field field="request" type="javax.servlet.http.HttpServletRequest"/>
- <string value="partyId"/>
- </call-class-method>
-
- <!-- Create party content -->
- <set-service-fields service-name="createPartyContent" map="formInput.formInput"
- to-map="partycontent"/>
- <set field="partycontent.contentId" from-field="formInput.formInput.contentId"/>
- <set field="partycontent.partyContentTypeId"
- from-field="formInput.formInput.partyContentTypeId"/>
- <set field="partycontent.partyId" from-field="formInput.formInput.partyId"/>
- <call-service service-name="createPartyContent" in-map-name="partycontent"/>
-
- <!-- Create communication event and content association -->
- <set-service-fields service-name="createCommEventContentAssoc"
- map="formInput.formInput" to-map="contentAssoc"/>
- <set field="contentAssoc.contentId" from-field="formInput.formInput.contentId"/>
- <set field="contentAssoc.communicationEventId"
- from-field="formInput.formInput.communicationEventId"/>
- <call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc">
- <result-to-field result-name="fromDate" field="fromDate"/>
- </call-service>
-
- <!-- Return to request -->
- <set field="communicationEventTypeId"
- from-field="formInput.formInput.communicationEventTypeId"/>
- <set field="communicationEventId" from-field="formInput.formInput.communicationEventId"/>
- <field-to-request field="communicationEventTypeId"
- request-name="communicationEventTypeId"/>
- <field-to-request field="communicationEventId" request-name="communicationEventId"/>
- </simple-method>
<simple-method method-name="createRegister"
short-description="Create person when new register" login-required="false">
Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=758522&r1=758521&r2=758522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Thu Mar 26 06:06:12 2009
@@ -29,7 +29,7 @@
<request-map uri="main">
<security https="true" auth="true"/>
- <response name="success" type="view" value="main"/>
+ <response name="success" type="request" value="showPortalPage"/>
</request-map>
<request-map uri="newRegisterLogin">
<security https="true" auth="false"/>
@@ -101,7 +101,7 @@
</request-map>
<!-- MY COMMUNICATIONS -->
- <request-map uri="myCommunications">
+ <!--request-map uri="myCommunications">
<security https="true" auth="true"/>
<response name="success" type="view" value="myCommunications"/>
</request-map>
@@ -133,10 +133,10 @@
<security https="true" auth="true"/>
<event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/>
<response name="success" type="request" value="myCommunications"/>
- </request-map>
+ </request-map-->
<!-- OTHER COMMUNICATIONS -->
- <request-map uri="otherCommunications">
+ <!--request-map uri="otherCommunications">
<security https="true" auth="true"/>
<response name="success" type="view" value="otherCommunications"/>
</request-map>
@@ -158,10 +158,10 @@
<event type="service" invoke="deleteCommunicationEvent"/>
<response name="success" type="request" value="getToNextDonePage"/>
<response name="error" type="view" value="ViewCommunicationEvent"/>
- </request-map>
+ </request-map-->
<!-- to clean up old data -->
- <request-map uri="createCommEventRoles">
+ <!--request-map uri="createCommEventRoles">
<security https="true" auth="true"/>
<event type="simple" invoke="createCommunicationEventRoles" path="org/ofbiz/myportal/Events.xml"/>
<response name="success" type="request" value="getToNextDonePage"/>
@@ -178,7 +178,7 @@
<response name="myTasks" type="request" value="myTasks"/>
<response name="myCompanyComms" type="request" value="myCompanyComms"/>
<response name="error" type="request-redirect-noparam" value="showPortalPage"/>
- </request-map>
+ </request-map-->
<!-- Create Customer Request-->
<request-map uri="newrequest">
@@ -207,7 +207,7 @@
</request-map>
<!-- EMAIL COMMUNICATIONS -->
- <request-map uri="NewCommunicationEvents">
+ <!--request-map uri="NewCommunicationEvents">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditCommunicationEvent"/>
</request-map>
@@ -254,7 +254,7 @@
<request-map uri="EditCommunicationEvent">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditCommunicationEvent"/>
- </request-map>
+ </request-map-->
<!-- CustRequest Content -->
<request-map uri="EditCustRequestContent">
@@ -276,24 +276,18 @@
<response name="error" type="view" value="EditCustRequestContent"/>
</request-map>
- <view-map name="main" type="screen" page="component://myportal/widget/CommonScreens.xml#main"/>
+ <view-map name="main" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
<view-map name="login" type="screen" page="component://myportal/widget/CommonScreens.xml#login"/>
<view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>
<view-map name="myTasks" type="screen" page="component://myportal/widget/CommonScreens.xml#MyTasks"/>
- <view-map name="myCommunications" type="screen" page="component://myportal/widget/CommonScreens.xml#MyCommunications"/>
- <view-map name="otherCommunications" type="screen" page="component://myportal/widget/CommonScreens.xml#OtherCommunications"/>
<view-map name="myCompanyComms" type="screen" page="component://myportal/widget/CommonScreens.xml#MyCompanyComms"/>
<view-map name="myTimesheet" type="screen" page="component://myportal/widget/CommonScreens.xml#MyTimesheet"/>
<view-map name="newEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#newEvent"/>
- <view-map name="ViewCommunicationEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ViewCommunicationEvent"/>
<view-map name="ViewRequest" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ViewRequest"/>
<view-map name="EditRequest" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditRequest"/>
<view-map name="ListInvoices" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListInvoices"/>
<view-map name="ListProjects" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListProjects"/>
- <!--
- <view-map name="custPreferences" type="screen" page="component://myportal/widget/CommonScreens.xml#custPreferences"/>
- -->
- <view-map name="EditCommunicationEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditCommunicationEvent"/>
+ <!--view-map name="EditCommunicationEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditCommunicationEvent"/>
<view-map name="addAttachmentEmail" type="screen" page="component://myportal/widget/MyPortalScreens.xml#addAttachmentEmail"/>
- <view-map name="EditCustRequestContent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditCustRequestContent"/>
+ <view-map name="EditCustRequestContent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditCustRequestContent"/-->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=758522&r1=758521&r2=758522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Mar 26 06:06:12 2009
@@ -44,6 +44,7 @@
<set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/>
<script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/>
<set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
+ <set field="my" value="My" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -100,16 +101,34 @@
<screen name="CommonCommunicationEventDecorator">
<section>
<actions>
- <set field="headerItem" value="${parameters.portalPageId}"/>
<entity-one entity-name="CommunicationEvent" value-field="commEvent">
<field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
</entity-one>
- <script location="component://myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" 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>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonMyCommunicationEventDecorator">
+ <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-section name="body">
- <include-menu location="component://myportal/widget/MyPortalMenus.xml" name="CommSubTabBar"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="MyCommSubTabBar"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -143,14 +162,6 @@
</section>
</screen>
- <screen name="main">
- <section>
- <widgets>
- <include-screen name="showPortalPage" location="component://common/widget/PortalPageScreens.xml"/>
- </widgets>
- </section>
- </screen>
-
<screen name="login">
<section>
<widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=758522&r1=758521&r2=758522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Mar 26 06:06:12 2009
@@ -189,61 +189,6 @@
<field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
</form>
- <form name="MyPortalNewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
- <actions>
- <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
- <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses">
- <condition-list combine="and">
- <condition-expr field-name="partyId" value="${userLogin.partyId}"/>
- <condition-expr field-name="contactFromDate" operator="less-equals" from-field="nowDate"/>
- <condition-list combine="or">
- <condition-expr field-name="contactThruDate" from-field="null"/>
- <condition-expr field-name="contactThruDate" operator="greater-equals" from-field="nowDate"/>
- </condition-list>
- <condition-expr field-name="purposeFromDate" operator="less-equals" from-field="nowDate"/>
- <condition-list combine="or">
- <condition-expr field-name="purposeThruDate" operator="greater-equals" from-field="nowDate"/>
- <condition-expr field-name="purposeThruDate" from-field="null"/>
- </condition-list>
- <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/>
- <condition-expr field-name="contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"/>
- </condition-list>
- <order-by field-name="infoString"/>
- </entity-condition>
- <set field="communicationEventId" from-field="parameters.communicationEventId"/>
- </actions>
- <alt-target use-when="communicationEventId!=null" target="updateCommunicationEvent"/>
- <field name="donePage"><hidden/></field>
- <field name="communicationEventId" use-when="communicationEventId!=null"><hidden/></field>
- <field name="communicationEventTypeId"><hidden value="AUTO_EMAIL_COMM"/></field>
- <field name="statusId"><hidden value="COM_IN_PROGRESS"/></field>
- <field name="parentCommEventId" use-when="parentCommEventId != null"><hidden value="${parameters.parentCommEventId}"/></field>
- <field name="parentCommEventId" use-when="originalCommEventId != null"><hidden value="${parameters.originalCommEventId}"/></field>
- <field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
- <field name="emailAddress" parameter-name="contactMechIdFrom">
- <drop-down>
- <list-options list-name="emailAddresses" description="${infoString}" key-name="contactMechId"/>
- </drop-down>
- </field>
- <field name="contactMechIdTo" title="${uiLabelMap.PartyEmailTo}">
- <lookup target-form-name="LookupPartyEmail" default-value="${parameters.contactMechIdTo}"/>
- </field>
- <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
- <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
- <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}"><display/></field>
- <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}">
- <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&partyId=${userLogin.partyId}&communicationEventId=${parameters.communicationEventId}" description="${uiLabelMap.MyPageAttachFile}"/>
- </field>
- <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
- <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field>
- <field name="send" title="&nbsp;" position="1">
- <hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSend}" target="javascript:(document.MyPortalNewEmail.submit())"/>
- </field>
- <field name="save" title="&nbsp;" position="2">
- <hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.MyPortalNewEmail.statusId.value='COM_PENDING'),(document.MyPortalNewEmail.submit())"/>
- </field>
- <field name="dummy" position="320"><hidden/></field>
- </form>
<form name="ListPhaseInfo" extends="ListPhaseInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
<field name="phase"><display description="${phaseName}"/></field>
</form>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=758522&r1=758521&r2=758522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Thu Mar 26 06:06:12 2009
@@ -58,104 +58,6 @@
</menu-item>
<menu-item name="myTime" title="${uiLabelMap.MyPortalMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
</menu>
- <menu name="CommSubTabBar" menu-container-style="button-bar button-style-2">
- <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
- <condition>
- <and>
- <if-has-permission permission="PARTYMGR_CME_CREATE"/>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
- </and>
- </condition>
- <link target="EditCommunicationEvent?portalPageId=${parameters.portalPageId}"/>
- </menu-item>
- <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
- <condition>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
- </condition>
- <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&portalPageId=${parameters.portalPageId}&statusId=COM_PENDING"/>
- </menu-item>
- <menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
- <condition>
- <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
- </condition>
- <link target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&portalPageId=${parameters.portalPageId}"/>
- </menu-item>
- <menu-item name="reply" title="${uiLabelMap.PartyReply}">
- <condition>
- <and>
- <not><if-empty field="parameters.communicationEventId"/></not>
- <not><if-empty field="communicationEvent.partyIdFrom"/></not>
- <if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
- <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
- </and>
- </condition>
- <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&parentCommEventId=${parameters.communicationEventId}&portalPageId=${parameters.portalPageId}"/>
- </menu-item>
- <menu-item name="forward" title="${uiLabelMap.PartyForward}">
- <condition>
- <and>
- <not><if-empty field="parameters.communicationEventId"/></not>
- <not><if-empty field="communicationEvent.partyIdFrom"/></not>
- <if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
- <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
- </and>
- </condition>
- <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&originalCommEventId=${parameters.communicationEventId}&portalPageId=${parameters.portalPageId}"/>
- </menu-item>
- <menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}">
- <condition>
- <and>
- <not><if-empty field="parameters.communicationEventId"/></not>
- <not><if-empty field="communicationEvent.partyIdFrom"/></not>
- <if-has-permission permission="ORDERMGR_CRQ_CREATE"/>
- </and>
- </condition>
- <link target="editRequestFromCommEvent?communicationEventId=${parameters.communicationEventId}"/>
- </menu-item>
- <menu-item name="close" title="${uiLabelMap.CommonClose}">
- <condition>
- <and>
- <not><if-empty field="communicationEventRole"/></not>
- <if-compare field="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
- </and>
- </condition>
- <link target="setCommunicationEventRoleStatus">
- <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/>
- <parameter param-name="roleTypeId" from-field="communicationEventRole.roleTypeId"/>
- <parameter param-name="statusId" value="COM_ROLE_COMPLETED"/>
- </link>
- </menu-item>
- <menu-item name="send" title="${uiLabelMap.CommonSend}">
- <condition>
- <and>
- <not><if-empty field="parameters.communicationEventId"/></not>
- <if-compare field="commEvent.statusId" operator="equals" value="COM_PENDING"/>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
- </and>
- </condition>
- <link target="updateCommunicationEvent/main">
- <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/>
- <parameter param-name="statusId" value="COM_IN_PROGRESS"/>
- </link>
- </menu-item>
- <menu-item name="delete" title="${uiLabelMap.CommonDelete}">
- <condition>
- <and>
- <not><if-empty field="communicationEventRole"/></not>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_DELETE"/>
- </and>
- </condition>
- <link target="RemoveCommunicationEventRole">
- <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/>
- <parameter param-name="roleTypeId" from-field="communicationEventRole.roleTypeId"/>
- <parameter param-name="deleteCommEventIfLast" value="Y"/>
- <parameter param-name="delContentDataResource" value="Y"/>
- </link>
- </menu-item>
- </menu>
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}" >
<link target="ViewRequest?custRequestId=${custRequest.custRequestId}"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=758522&r1=758521&r2=758522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Thu Mar 26 06:06:12 2009
@@ -177,107 +177,6 @@
</widgets>
</section>
</screen>
- <screen name="ViewCommunicationEvent">
- <section>
- <actions>
- <set field="portalPageId" value="${parameters.portalPageId}"/>
- <set field="titleProperty" value="PageTitleViewCommunication" />
- <set field="tabButtonItem" value="OverView" />
- <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
- <set field="headerItem" from-field="parameters.portalPageId" />
- </actions>
- <widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="lefthalf">
- <section>
- <widgets>
- <label style="h1"
- text="${uiLabelMap.MyPortalCommunicationEventId} ${parameters.communicationEventId}"></label>
- <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>
- <set field="portalPageId" from-field="parameters.portalPageId"/>
- </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}" />
- <section>
- <actions>
- <set field="portalPageId" value="${parameters.portalPageId}"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.PartyCommEventRoles}">
- <include-form name="ViewCommRoles"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
- </screenlet>
- </widgets>
- </section>
- <section>
- <actions>
- <set field="portalPageId" value="${parameters.portalPageId}"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.PartyCommContent}">
- <include-form name="listCommContent"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
- </screenlet>
- </widgets>
- </section>
- <section>
- <actions>
- <entity-and list="commEvents" entity-name="CommunicationEvent">
- <field-map field-name="parentCommEventId"
- from-field="parameters.communicationEventId" />
- </entity-and>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}">
- <include-form name="ListCommEvents"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
- </screenlet>
- </widgets>
- </section>
- <section>
- <actions>
- <set field="entityName" value="CustRequestAndCommEvent" />
- <set field="requestParameters.communicationEventId"
- from-field="parameters.communicationEventId" />
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.OrderRequestList}">
- <include-form name="ListRequests"
- location="component://order/webapp/ordermgr/request/RequestForms.xml" />
- </screenlet>
- </widgets>
- </section>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="ViewRequest">
<section>
<actions>
@@ -416,125 +315,6 @@
</widgets>
</section>
</screen>
- <screen name="EditCommunicationEvent">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleEditCommunication" />
- <set field="tabButtonItem" value="CommunicationEvent" />
- <set field="portalPageId" from-field="parameters.portalPageId" default-value="parameters.portalPageId"/>
- <set field="headerItem" from-field="parameters.portalPageId"/>
- <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
- <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section><!-- Email -->
- <condition>
- <or><!-- have for e-mails a special form -->
- <if-compare field="parameters.communicationEventTypeId"
- operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field="parameters.communicationEventTypeId"
- operator="equals" value="AUTO_EMAIL_COMM" />
- </or>
- </condition>
- <widgets>
- <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true">
- <include-form location="component://myportal/widget/MyPortalForms.xml" name="MyPortalNewEmail"/>
- <include-screen name="AttachFiletList"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <condition><!-- internal note -->
- <if-compare field="parameters.communicationEventTypeId"
- operator="equals" value="COMMENT_NOTE" />
- </condition>
- <widgets>
- <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="NewInternalNote"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <condition><!-- others -->
- <and>
- <if-compare field="parameters.communicationEventTypeId"
- operator="not-equals" value="COMMENT_NOTE" />
- <if-compare field="parameters.communicationEventTypeId"
- operator="not-equals" value="EMAIL_COMMUNICATION" />
- <if-compare field="parameters.communicationEventTypeId"
- operator="not-equals" value="AUTO_EMAIL_COMM" />
- </and>
- </condition>
- <widgets>
- <screenlet id="EditCommunicationEventPanel"
- title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true">
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="EditCommEvent" />
- </screenlet>
- <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}"
- navigation-form-name="ListChildCommEvents">
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ListChildCommEvents" />
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="addAttachmentEmail">
- <section>
- <actions>
- <entity-condition entity-name="MimeType" list="mimeTypes">
- <order-by field-name="description"/>
- <order-by field-name="mimeTypeId"/>
- </entity-condition>
- <set field="communicationEventId" from-field="parameters.communicationEventId"/>
- <set field="communicationEventTypeId" from-field="parameters.communicationEventTypeId"/>
- <set field="partyId" from-field="userLogin.partyId"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific>
- <html>
- <html-template location="component://myportal/webapp/myportal/addAttachFile.ftl"/>
- </html>
- </platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="AttachFiletList">
- <section>
- <actions>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <entity-and entity-name="CommEventContentAssoc" list="commEventContent">
- <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
- </entity-and>
- <entity-and entity-name="PartyContent" list="partyContent">
- <field-map field-name="partyId" from-field="userLogin.partyId"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://myportal/webapp/myportal/attachFileList.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </screen>
<screen name="ListProjects">
<section>
<actions>