Author: hansbak
Date: Sun Apr 26 06:02:02 2009
New Revision: 768661
URL: http://svn.apache.org/viewvc?rev=768661&view=rev
Log:
various fixes in the chain commevent -> cust request -> project task
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
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=768661&r1=768660&r2=768661&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
Sun Apr 26 06:02:02 2009
@@ -430,6 +430,7 @@
<call-service service-name="setCommunicationEventStatus"
in-map-name="updStat"/>
<field-to-result field="parameters.custRequestId"
result-name="custRequestId"/>
+ <string-to-list string="Customer request ${parameters.custRequestId}
created" list="successMessageList"/>
</simple-method>
<!-- Create/Delete CustRequest Content -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=768661&r1=768660&r2=768661&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sun
Apr 26 06:02:02 2009
@@ -1143,7 +1143,7 @@
<request-map uri="setCustRequestStatus">
<security https="true" auth="true"/>
<event type="service" invoke="setCustRequestStatus"/>
- <response name="success" type="view-last"/>
+ <response name="success" type="view-home"/>
<response name="error" type="view" value="EditRequest"/>
</request-map>
<request-map uri="requestroles"><security https="true"
auth="true"/><response name="success" type="view"
value="RequestRoles"/></request-map>
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=768661&r1=768660&r2=768661&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sun
Apr 26 06:02:02 2009
@@ -564,7 +564,7 @@
<entity-options description="${description}"
entity-name="ContentType"/>
</drop-down>
</field>
- <field name="statusId" use-when="content==null">
+ <field name="statusId" use-when="contentId==void">
<drop-down allow-empty="false"
no-current-selected-key="CTNT_AVAILABLE">
<entity-options description="${description}"
entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId"
value="CONTENT_STATUS"/>
@@ -572,7 +572,7 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" use-when="content!=null">
+ <field name="statusId" use-when="contentId!=void">
<drop-down allow-empty="false"
current-description="${currentStatus.description}"
no-current-selected-key="CTNT_AVAILABLE">
<entity-options entity-name="StatusValidChangeToDetail"
key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId"
value="${content.statusId}"/>
@@ -580,11 +580,11 @@
</entity-options>
</drop-down>
</field>
- <field name="mimeTypeId" >
+ <!--field name="mimeTypeId" >
<drop-down allow-empty="false">
<entity-options description="${description}"
entity-name="MimeType" key-field-name="mimeTypeId"/>
</drop-down>
- </field>
+ </field-->
<field name="dataResourceName"
title="${uiLabelMap.CommonUpload}*"><file/></field>
<field name="dataCategoryId" use-when="dataResource==null">
<drop-down allow-empty="false">
@@ -602,7 +602,7 @@
</field>
<field name="createButton"><submit button-type="button"/></field>
</form>
- <form name="ListCustRequestContent" type="list"
list-name="custRequstAndContents"
+ <form name="ListCustRequestContent" type="list"
list-name="custRequestAndContents"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" paginate-target="EditCustRequestContent">
<field name="custRequestId"><hidden/></field>
<field name="contentId">
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=768661&r1=768660&r2=768661&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun
Apr 26 06:02:02 2009
@@ -799,7 +799,7 @@
<request-map uri="createRequestFromCommEvent">
<security https="true" auth="true"/>
<event type="service" invoke="createCustRequestFromCommEvent"/>
- <response name="success" type="view-last"/>
+ <response name="success" type="view-home"/>
<response name="error" type="view-last"/>
</request-map>
@@ -855,8 +855,8 @@
<request-map uri="RemoveCommunicationEventRole">
<security https="true" auth="true"/>
<event type="service" invoke="removeCommunicationEventRole"/>
- <response name="success" type="view-last"/>
- <response name="error" type="view-last"/>
+ <response name="success" type="view-home"/>
+ <response name="error" type="view-home"/>
</request-map>
<request-map uri="ListPartyCommEvents"><security https="true"
auth="true"/><response name="success" type="view"
value="ListPartyCommEvents"/></request-map>
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=768661&r1=768660&r2=768661&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Sun Apr 26 06:02:02 2009
@@ -190,7 +190,9 @@
<field name="contentMimeTypeId"><hidden value="text/plain"/></field>
<field name="content" title="${uiLabelMap.CommonContent}"><textarea
cols="60" rows="10" default-value="${parameters.content}"/></field>
<field name="send" title="&nbsp;" position="1"
use-when="communicationEvent!=null">
- <hyperlink also-hidden="true" target-type="plain"
description="${uiLabelMap.CommonSend}"
target="javascript:(document.EditInternalNote.statusId.value='COM_COMPLETED'),(document.EditInternalNote.submit())"/>
+ <hyperlink also-hidden="true"
+ target-type="plain" description="${uiLabelMap.CommonSend}"
+
target="javascript:(document.EditInternalNote.statusId.value='COM_COMPLETE'),(document.EditInternalNote.submit())"/>
</field>
<field name="save" title="&nbsp;" position="2"
use-when="communicationEvent!=null">
<hyperlink also-hidden="true" target-type="plain"
description="${uiLabelMap.CommonSave}"
target="javascript:(document.EditInternalNote.submit())"/>
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=768661&r1=768660&r2=768661&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
Sun Apr 26 06:02:02 2009
@@ -113,8 +113,10 @@
List<GenericValue> toBeStored = FastList.newInstance();
for (Map.Entry<String, Long> entry: keywords.entrySet()) {
- GenericValue workEffortKeyword =
delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId",
workEffort.getString("workEffortId"), "keyword", entry.getKey(),
"relevancyWeight", entry.getValue()));
- toBeStored.add(workEffortKeyword);
+ if (entry.getKey().length() < 60) { // ignore very long
strings, cannot be stored anyway
+ GenericValue workEffortKeyword =
delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId",
workEffort.getString("workEffortId"), "keyword", entry.getKey(),
"relevancyWeight", entry.getValue()));
+ toBeStored.add(workEffortKeyword);
+ }
}
if (toBeStored.size() > 0) {
if (Debug.verboseOn()) Debug.logVerbose("WorkEffortKeywordIndex
indexKeywords Storing " + toBeStored.size() + " keywords for workEffortId " +
workEffort.getString("workEffortId"), module);
