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/06/27 12:54:31 UTC
svn commit: r788950 - in /ofbiz/trunk: applications/commonext/entitydef/
applications/commonext/script/org/ofbiz/ applications/commonext/servicedef/
applications/commonext/widget/
applications/order/script/org/ofbiz/order/request/ applications/order/se...
Author: hansbak
Date: Sat Jun 27 10:54:31 2009
New Revision: 788950
URL: http://svn.apache.org/viewvc?rev=788950&view=rev
Log:
Now allows for employees to add a note to the customer request, the customer gets notified by email with an url. If he logs in he can also add a note as a reply to the note of the employee, the employee will be notified with a system info message when the customer added the note
Modified:
ofbiz/trunk/applications/commonext/entitydef/entitymodel.xml
ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
ofbiz/trunk/applications/commonext/servicedef/secas.xml
ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/order/servicedef/secas.xml
ofbiz/trunk/applications/order/servicedef/services_request.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/framework/common/servicedef/services.xml
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/themes/flatgrey/includes/header.ftl
Modified: ofbiz/trunk/applications/commonext/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/entitydef/entitymodel.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/commonext/entitydef/entitymodel.xml Sat Jun 27 10:54:31 2009
@@ -28,6 +28,10 @@
<extend-entity entity-name="NoteData">
<field name="moreInfoPortletId" type="value"><description>url to go to the related portlet screen in the system</description></field>
+ <field name="moreInfoItemId" type="value"><description>The id of the item to be displayed i.e. custRequestId, inoiceId etc</description></field>
+ <index name="systemInfo">
+ <index-field name="infoName"/>
+ </index>
</extend-entity>
</entitymodel>
Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml (original)
+++ ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml Sat Jun 27 10:54:31 2009
@@ -32,6 +32,11 @@
<field-map field-name="communicationEventId" from-field="parameters.entityNameId"/>
</entity-and>
<if-not-empty field="roles">
+ <make-value value-field="noteData" entity-name="NoteData"/>
+ <now-timestamp field="noteData.noteDateTime"/>
+ <set field="noteData.noteName" value="SYSTEMNOTE"/>
+ <set field="noteData.noteInfo" value="New incoming communication event: ${comm.subject} from ${comm.partyIdFrom}"/>
+ <set field="noteData.moreInfoPortletId" value="MyCommunications"/>
<iterate entry="role" list="roles">
<if-compare field="role.statusId" value="COM_ROLE_CREATED" operator="equals">
<set field="partyId" from-field="role.partyId"/>
@@ -61,13 +66,8 @@
</and>
</condition>
<then>
- <make-value value-field="noteData" entity-name="NoteData"/>
- <set field="noteData.noteParty" from-field="role.partyId"/>
- <set field="noteData.noteName" value="SYSTEMNOTE"/>
- <now-timestamp field="noteData.noteDateTime"/>
<sequenced-id sequence-name="NoteData" field="noteData.noteId"/>
- <set field="noteData.noteInfo" value="New incoming communication event: ${comm.subject} from ${comm.partyIdFrom}"/>
- <set field="noteData.moreInfoPortletId" value="MyCommunications"/>
+ <set field="noteData.noteParty" from-field="role.partyId"/>
<create-value value-field="noteData"/>
</then>
</if>
@@ -84,17 +84,52 @@
<field-map field-name="workEffortId" from-field="parameters.entityNameId"/>
</entity-one>
<make-value value-field="noteData" entity-name="NoteData"/>
- <set field="noteData.noteParty" from-field="partyId"/>
- <set field="noteData.noteName" value="SYSTEMNOTE"/>
<now-timestamp field="noteData.noteDateTime"/>
- <set field="noteData.noteInfo" value="New task assignment '${workEffort.workEffortName}' [${workEffort.workEffortId}]"/>
<sequenced-id sequence-name="NoteData" field="noteData.noteId"/>
+ <set field="noteData.noteParty" from-field="role.partyId"/>
+ <set field="noteData.noteName" value="SYSTEMNOTE"/>
+ <set field="noteData.noteInfo" value="New task assignment '${workEffort.workEffortName}' [${workEffort.workEffortId}]"/>
<set field="noteData.moreInfoPortletId" value="mytasks"/>
<create-value value-field="noteData"/>
</if-compare>
</if-compare>
</if-compare>
-
+ <!-- Create a system info note to all customer request participants if a note was added to the customer request
+ the originator of the customer request will get already a email so does not need to be notified-->
+ <if-compare field="parameters.entityName" value="CustRequestItemNote" operator="equals">
+ <!-- find related customer request originator -->
+ <entity-and entity-name="CustRequestItemNoteView" list="custRequesItems">
+ <field-map field-name="noteId" from-field="parameters.entityNameId"/>
+ </entity-and>
+ <first-from-list entry="custRequesItem" list="custRequesItems"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest">
+ <field-map field-name="custRequestId" from-field="custRequesItem.custRequestId"/>
+ <select-field field-name="fromPartyId"/>
+ <select-field field-name="custRequestName"/>
+ </entity-one>
+ <!-- find all parties who have added a note to this request item excluding the originator (he already gets email)-->
+ <entity-condition entity-name="CustRequestItemNoteView" list="custRequestParties" distinct="true">
+ <condition-list combine="and">
+ <condition-expr field-name="partyId" operator="not-equals" from-field="custRequest.fromPartyId"/>
+ <condition-expr field-name="custRequestId" from-field="custRequesItem.custRequestId"/>
+ <condition-expr field-name="custRequestItemSeqId" from-field="custRequesItem.custRequestItemSeqId"/>
+ </condition-list>
+ <select-field field-name="partyId"/>
+ <select-field field-name="custRequestId"/>
+ <select-field field-name="custRequestItemSeqId"/>
+ </entity-condition>
+ <make-value value-field="noteData" entity-name="NoteData"/>
+ <now-timestamp field="noteData.noteDateTime"/>
+ <set field="noteData.noteName" value="SYSTEMNOTE"/>
+ <set field="noteData.moreInfoPortletId" value="ViewCustRequest"/>
+ <set field="noteData.moreInfoItemId" from-field="custRequest.custRequestId"/>
+ <set field="noteData.noteInfo" value="A note has been added to customer request ${custRequest.custRequestName} [${custRequest.custRequestId}]"/>
+ <iterate entry="custRequestParty" list="custRequestParties">
+ <sequenced-id sequence-name="NoteData" field="noteData.noteId"/>
+ <set field="noteData.noteParty" from-field="custRequestParty.partyId"/>
+ <create-value value-field="noteData"/>
+ </iterate>
+ </if-compare>
</simple-method>
<simple-method method-name="getPortletAttributeMap" short-description="get the attributes of the SystemInfoNotes portlet for a userlogin">
@@ -196,5 +231,5 @@
<field-to-result field="lastSystemInfoNote3"/>
</if-not-empty>
</simple-method>
-
+
</simple-methods>
Modified: ofbiz/trunk/applications/commonext/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/servicedef/secas.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/commonext/servicedef/secas.xml Sat Jun 27 10:54:31 2009
@@ -20,18 +20,27 @@
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
- <!-- update existing comm events into status: entered-->
+ <!-- send a note when a communicationevent is created for a certain loginId when an
+ existing comm event's status changes into status: entered-->
<eca service="setCommunicationEventStatus" event="commit">
<condition field-name="statusId" operator="equals" value="COM_ENTERED"/>
<set field-name="entityName" value="CommunicationEvent"/>
<set field-name="entityNameId" env-name="communicationEventId"/>
<action service="createSystemInfoNote" mode="sync"/>
</eca>
- <!-- creation comm events with status entered -->
+ <!-- send a note when a communicationevent is created for a certain loginId
+ with the status entered -->
<eca service="createCommunicationEvent" event="commit">
<condition field-name="statusId" operator="equals" value="COM_ENTERED"/>
<set field-name="entityName" value="CommunicationEvent"/>
<set field-name="entityNameId" env-name="communicationEventId"/>
<action service="createSystemInfoNote" mode="sync"/>
</eca>
+ <!-- send a system note to all Customer request participants (excluding the originator)
+ when a note is added to a particular customer request.-->
+ <eca service="createCustRequestItemNote" event="commit">
+ <set field-name="entityName" value="CustRequestItemNote"/>
+ <set field-name="entityNameId" env-name="noteId"/>
+ <action service="createSystemInfoNote" mode="sync"/>
+ </eca>
</service-eca>
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Sat Jun 27 10:54:31 2009
@@ -65,13 +65,14 @@
</condition>
<actions>
<service service-name="getLastSystemInfoNote" result-map="resultNote"/>
+ <set field="linkStart" value="/myportal/control/showPortletDecorator?portalPortletId="/>
<set field="layoutSettings.middleTopHeader" value="----------Last system notes----------"/>
<set field="layoutSettings.middleTopMessage1" value="${groovy:resultNote.lastSystemInfoNote1!=null?resultNote.lastSystemInfoNote1.noteDateTime.toString().substring(0,16) + " " + resultNote.lastSystemInfoNote1.noteInfo:""}"/>
- <set field="layoutSettings.middleTopLink1" from-field="resultNote.lastSystemInfoNote1.moreInfoPortletId"/>
+ <set field="layoutSettings.middleTopLink1" value="${linkStart}${resultNote.lastSystemInfoNote1.moreInfoPortletId}&id=${resultNote.lastSystemInfoNote1.moreInfoItemId}"/>
<set field="layoutSettings.middleTopMessage2" value="${groovy:resultNote.lastSystemInfoNote2!=null?resultNote.lastSystemInfoNote2.noteDateTime.toString().substring(0,16) + " " + resultNote.lastSystemInfoNote2.noteInfo:""}"/>
- <set field="layoutSettings.middleTopLink2" from-field="resultNote.lastSystemInfoNote2.moreInfoPortletId"/>
+ <set field="layoutSettings.middleTopLink2" value="${linkStart}${resultNote.lastSystemInfoNote2.moreInfoPortletId}&id=${resultNote.lastSystemInfoNote2.moreInfoItemId}"/>
<set field="layoutSettings.middleTopMessage3" value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16) + " " + resultNote.lastSystemInfoNote3.noteInfo:""}"/>
- <set field="layoutSettings.middleTopLink3" from-field="resultNote.lastSystemInfoNote3.moreInfoPortletId"/>
+ <set field="layoutSettings.middleTopLink3" value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/>
</actions>
<widgets/>
</section>
Modified: ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml Sat Jun 27 10:54:31 2009
@@ -24,7 +24,7 @@
<form name="SystemInfoNotes" type="list" list-name="systemInfoNotes"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="Date info created"><display type="date-time"/></field>
- <field name="noteInfo" title="System Info Note"><hyperlink target="/myportal/control/showPortletDecorator?portalPortletId=${moreInfoPortletId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="System Info Note"><hyperlink target="/myportal/control/showPortletDecorator?portalPortletId=${moreInfoPortletId}&id=${moreInfoItemId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
</form>
<form name="EditSysInfoPortletParams" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Sat Jun 27 10:54:31 2009
@@ -49,7 +49,6 @@
</simple-method>
<simple-method method-name="createCustRequest" short-description="Create Customer Request">
- <log level="always" message="======start create with story: ${parameters.story}"/>
<make-value value-field="newEntity" entity-name="CustRequest"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -81,7 +80,6 @@
<set-service-fields service-name="setCustRequestStatus" map="parameters" to-map="setStat"/>
<call-service service-name="setCustRequestStatus" in-map-name="setStat"/>
-<log level="always" message="========================== story: ${parameters.story}"></log>
<!-- create also the item if key fields are provided -->
<if>
<condition>
@@ -234,8 +232,10 @@
<set from-field="parameters.custRequestId" field="newEntity.custRequestId"/>
<set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/>
<set from-field="parameters.note" field="newNoteMap.note"/>
+ <set from-field="parameters.partyId" field="newNoteMap.partyId"/>
<call-service service-name="createNote" in-map-name="newNoteMap">
<result-to-field result-name="noteId" field="newEntity.noteId"/>
+ <result-to-result result-name="partyId"/><!-- for notification services -->
</call-service>
<create-value value-field="newEntity"/>
<field-to-result field="newEntity.noteId" result-name="noteId"/>
@@ -413,17 +413,7 @@
<set-service-fields service-name="createCustRequestCommEvent" map="parameters" to-map="custRequestCommEvent"/>
<call-service service-name="createCustRequestCommEvent" in-map-name="custRequestCommEvent"/>
- <if-empty field="parameters.content">
- <set field="parameters.content" from-field="communicationEvent.content"/>
- </if-empty>
- <if-not-empty field="parameters.content">
- <set field="newItem.custRequestId" from-field="parameters.custRequestId"/>
- <set field="newItem.description" from-field="parameters.description"/>
- <set field="newItem.story" from-field="parameters.content"/>
- <call-service service-name="createCustRequestItem" in-map-name="newItem"/>
- </if-not-empty>
-
- <!-- copy attachements/content -->
+ <!-- copy attachments/content -->
<entity-and entity-name="CommEventContentAssoc" list="custRequestContents">
<field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
</entity-and>
Modified: ofbiz/trunk/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/secas.xml Sat Jun 27 10:54:31 2009
@@ -362,8 +362,9 @@
<set field-name="emailTemplateSettingId" value="CUST_REQ_COMPLETED"/>
<action service="sendMailFromTemplateSetting" mode="sync"/>
</eca>
- <!-- notification a item note was added to the customer request -->
+ <!-- notification a item note was added to the customer request by other people than the originator -->
<eca service="createCustRequestItemNote" event="commit">
+ <condition field-name="partyIdTo" operator="not-equals" value="notePartyId"/>
<set field-name="bodyParameters.custRequestId" env-name="custRequestId"/>
<set field-name="bodyParameters.custRequestItemSeqId" env-name="custRequestItemSeqId"/>
<set field-name="bodyParameters.noteId" env-name="noteId"/>
Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Sat Jun 27 10:54:31 2009
@@ -40,9 +40,10 @@
<permission-service service-name="custRequestPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <attribute name="fromPartyId" type="String" mode="IN" optional="false"/>
<auto-attributes include="all" mode="IN" entity-name="CustRequestItem" optional="true"/>
+ <attribute name="fromPartyId" type="String" mode="IN" optional="false"/>
<override name="custRequestName" allow-html="safe"/>
+ <override name="description" allow-html="safe"/>
<override name="story" allow-html="safe"/>
</service>
<service name="updateCustRequest" engine="simple" default-entity-name="CustRequest"
@@ -135,6 +136,7 @@
<attribute name="custRequestItemSeqId" type="String" mode="IN" optional="false"/>
<attribute name="note" type="String" mode="IN" optional="false"/>
<attribute name="noteId" type="String" mode="OUT" optional="false"/>
+ <attribute name="partyId" type="String" mode="INOUT" optional="true"/><!-- party who created the note -->
<attribute name="fromPartyId" type="String" mode="OUT" optional="true"/><!-- party to be notified -->
<attribute name="custRequestName" type="String" mode="OUT" optional="true"/><!-- for notification services -->
</service>
@@ -176,9 +178,8 @@
<attribute name="custRequestId" mode="IN" type="String" optional="true"/>
<attribute name="custRequestId" mode="OUT" type="String" optional="false"/>
<attribute name="custRequestTypeId" mode="IN" type="String" optional="true"/>
- <attribute name="custRequestName" mode="IN" type="String" optional="true"/>
- <override name="content" allow-html="safe"/>
- <override name="custRequestName" allow-html="safe"/>
+ <attribute name="custRequestName" mode="IN" type="String" optional="true" allow-html="safe"/>
+ <attribute name="story" mode="IN" type="String" optional="true" allow-html="safe"/>
</service>
<!-- custRequest content services -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl Sat Jun 27 10:54:31 2009
@@ -20,17 +20,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title}</title>
- <link rel="stylesheet" href="${baseUrl?if_exists}/images/maincss.css" type="text/css"/>
+ <link rel="stylesheet" href="${baseSecureUrl?if_exists}/images/maincss.css" type="text/css"/>
</head>
<body>
<h2>${title}</h2>
<p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p>
<p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br/>
- ${noteData.noteInfo?if_exists}
+ ${StringUtil.wrapString(noteData.noteInfo?if_exists)}
<br/><br/>
- Please reply by email.<br/><br/>
+ Please login to the url below and add another note as a reply if required.<br/><br/>
The status and used hours can always be checked <br/>
- <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&custRequestId=${custRequest.custRequestId}">here.....</a>
+ <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a>
<br/><br/>
Regards.<br/><br/>
Thank you for your business.
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Sat Jun 27 10:54:31 2009
@@ -28,7 +28,7 @@
<p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed.
<br/><br/>
The status and used hours can always be checked at the url: <br/>
- <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
+ <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
<br/><br/>
Regards.<br/><br/>
Thank you for your business.
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Sat Jun 27 10:54:31 2009
@@ -30,7 +30,7 @@
We will solve/implement the request as soon as possible
<br/><br/>
The status and used hours can always be checked <br/>
- <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&custRequestId=${custRequest.custRequestId}">here....</a>
+ <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a>
<br/><br/>
Regards.
<br/><br/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Sat Jun 27 10:54:31 2009
@@ -46,7 +46,7 @@
<screen name="ViewCustRequest">
<section>
<actions>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
+ <set field="custRequestId" from-field="parameters.custRequestId" default-value="${parameters.id}"/>
<entity-one entity-name="CustRequest" value-field="custRequest"/>
<get-related-one value-field="custRequest" relation-name="CustRequestType" to-value-field="custRequestType"/>
<get-related-one value-field="custRequest" relation-name="StatusItem" to-value-field="statusItem"/>
Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services.xml Sat Jun 27 10:54:31 2009
@@ -50,7 +50,7 @@
<service name="createNote" engine="java"
location="org.ofbiz.common.CommonServices" invoke="createNote">
<description>Create a new note record</description>
- <attribute name="partyId" type="String" mode="IN" optional="true"/>
+ <attribute name="partyId" type="String" mode="INOUT" optional="true"/>
<attribute name="noteName" type="String" mode="IN" optional="true"/>
<attribute name="note" type="String" mode="IN"/>
<attribute name="noteId" type="String" mode="OUT"/>
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Sat Jun 27 10:54:31 2009
@@ -160,6 +160,7 @@
Map<String, Object> result = ServiceUtil.returnSuccess();
result.put("noteId", noteId);
+ result.put("partyId", partyId);
return result;
}
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=788950&r1=788949&r2=788950&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Sat Jun 27 10:54:31 2009
@@ -141,9 +141,9 @@
<li class=h4>
<div class="divHidden">
<center>${layoutSettings.middleTopHeader?if_exists}</center>
- <a href="/myportal/control/showPortletDecorator?portalPortletId=${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
- <a href="/myportal/control/showPortletDecorator?portalPortletId=${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
- <a href="/myportal/control/showPortletDecorator?portalPortletId=${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
+ <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
+ <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
+ <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
</div>
</li>
</#if>