svn commit: r993349 - in /ofbiz/branches/release10.04: ./ applications/content/script/org/ofbiz/content/data/DataServices.xml

[ashish-18]

Author: ashish
Date: Tue Sep  7 13:23:56 2010
New Revision: 993349

URL: http://svn.apache.org/viewvc?rev=993349&view=rev
Log:
Applied fix from trunk for revision: 993344
===

Applied patch from jira issue - OFBIZ-3923 - Bug in updating local file content.

attachUploadToDataResource (member service of updateContentAndUploadedFile service group) service calls saveLocalFileDateResource simple method to save the local file and attach it to data resource. The case where updating a local file content but not uploading a new file is being handled but doesn't work since on finding DataResource object "isUpdate" flag is not set to "Y".

Here is the patch for the fix. Also fixed typo in simple method name, saveLocalFileDateResource => saveLocalFileDataResource.


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/data/DataServices.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  7 13:23:56 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344

Modified: ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=993349&r1=993348&r2=993349&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Sep  7 13:23:56 2010
@@ -589,7 +589,7 @@ under the License.
         </if-empty>
 
         <if-compare field="parameters.dataResourceTypeId" value="LOCAL_FILE" operator="equals">
-            <call-simple-method method-name="saveLocalFileDateResource"/>
+            <call-simple-method method-name="saveLocalFileDataResource"/>
             <return/>
         </if-compare>
 
@@ -642,10 +642,15 @@ under the License.
     </simple-method>
 
     <!-- save LOCAL_FILE data -->
-    <simple-method method-name="saveLocalFileDateResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE">
+    <simple-method method-name="saveLocalFileDataResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE">
         <entity-one entity-name="DataResource" value-field="dataResource"/>
         <if-empty field="dataResource">
             <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
+            <else>
+                <if-not-empty field="dataResource.objectInfo">
+                    <set field="isUpdate" value="Y"/>
+                </if-not-empty>
+            </else>
         </if-empty>
         <if>
             <condition>