svn commit: r614819 - in /ofbiz/branches/release4.0/applications: content/servicedef/services.xml content/src/org/ofbiz/content/ContentManagementServices.java party/webapp/partymgr/communication/CommForms.xml

Author: jleroux
Date: Thu Jan 24 00:39:07 2008
New Revision: 614819

URL: http://svn.apache.org/viewvc?rev=614819&view=rev
Log:
Applied fix from trunk for revision: 614733. Contains fix from trunk for revision: 614735 (done by hand was in conflict from 1st merge)

Modified:
    ofbiz/branches/release4.0/applications/content/servicedef/services.xml
    ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/ContentManagementServices.java
    ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml

Modified: ofbiz/branches/release4.0/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/servicedef/services.xml?rev=614819&r1=614818&r2=614819&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/content/servicedef/services.xml (original)
+++ ofbiz/branches/release4.0/applications/content/servicedef/services.xml Thu Jan 24 00:39:07 2008
@@ -410,7 +410,6 @@
             <exclude field-name="contentId"/>
             <exclude field-name="fromDate"/>
             <exclude field-name="contentAssocTypeId"/>
-            <exclude field-name="sequenceNum"/>
         </auto-attributes>
         <auto-attributes entity-name="ContentAssocDataResourceViewTo" include="all" mode="IN" optional="true">
         </auto-attributes>

Modified: ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=614819&r1=614818&r2=614819&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/ContentManagementServices.java Thu Jan 24 00:39:07 2008
@@ -301,6 +301,7 @@
                 contentContext.put("userLogin", userLogin);
                 contentContext.put("displayFailCond", bDisplayFailCond);
                 contentContext.put("skipPermissionCheck", context.get("skipPermissionCheck"));
+                Debug.logInfo("In persistContentAndAssoc calling updateContent with content: " + contentContext, module);
                 Map thisResult = dispatcher.runSync("updateContent", contentContext);
                 if (ServiceUtil.isError(thisResult) || ServiceUtil.isFailure(thisResult)) {
                     return ServiceUtil.returnError("Error updating content (updateContent) in persistContentAndAssoc", null, null, thisResult);

Modified: ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml?rev=614819&r1=614818&r2=614819&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jan 24 00:39:07 2008
@@ -403,6 +403,7 @@
     <form name="editCommContent" type="single" target="updateCommContentDataResource" default-map-name="commEventContentDataResource">
         <field name="communicationEventId"><display/></field>
         <field name="contentId"><display/></field>
+        <field name="contentTypeId"><hidden/></field>
         <field name="dataResourceId"><display/></field>
         <field name="contentName"><text/></field>
         <field name="fromDate"><display/></field>