svn commit: r614733 - in /ofbiz/trunk/applications: content/servicedef/services.xml content/src/org/ofbiz/content/ContentManagementServices.java party/webapp/partymgr/communication/CommForms.xml

[adrianc]

Author: adrianc
Date: Wed Jan 23 15:37:19 2008
New Revision: 614733

URL: http://svn.apache.org/viewvc?rev=614733&view=rev
Log:
Fixed bug in Party Manager Edit Comm Content screen - https://issues.apache.org/jira/browse/OFBIZ-1575.

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

Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=614733&r1=614732&r2=614733&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Wed Jan 23 15:37:19 2008
@@ -433,7 +433,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/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=614733&r1=614732&r2=614733&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Wed Jan 23 15:37:19 2008
@@ -309,6 +309,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);
@@ -734,7 +735,7 @@
                   return ServiceUtil.returnError(errorMsg);
               }
           } else {
-              return ServiceUtil.returnError("'byteBuffer' empty when trying to create database image.");
+//              return ServiceUtil.returnError("'byteBuffer' empty when trying to create database image.");
           }
       } else if (dataResourceTypeId.equals("SHORT_TEXT")) {
       } else if (dataResourceTypeId.startsWith("SURVEY")) {

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=614733&r1=614732&r2=614733&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Wed Jan 23 15:37:19 2008
@@ -520,6 +520,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <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>