[erp5_core/erp5_web_renderjs_ui] jIO 3.39.0

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js

@@ -10340,7 +10340,8 @@ return new Parser;
     // ie, replication should prevent losing user data
     // Synchronize attachments before, to ensure
     // all of them will be deleted too
-    var result;
+    var result,
+      previous_report_length;
     if (context._signature_hash_key !== undefined) {
       if (options.conflict) {
         report.log(id, options.from_local ? LOG_FORCE_DELETE_REMOTE :
@@ -10354,12 +10355,21 @@ return new Parser;
           return context._signature_sub_storage.remove(id);
         });
     } else {
+      previous_report_length = report._list.length;
       result = repairDocumentAttachment(context, id, report)
         .push(function () {
-          return destination.allAttachments(id);
-        })
-        .push(function (attachment_dict) {
-          if (JSON.stringify(attachment_dict) === "{}") {
+          var next_report_length = report._list.length,
+            has_error = false,
+            i;
+          // Check if there was an error during attachment replication
+          for (i = previous_report_length; i < next_report_length; i += 1) {
+            if ((report._list[i][1] === id) &&
+                (report._list[i][0] < 100)) {
+              has_error = true;
+            }
+          }
+          if (!has_error) {
+            // Attachment repication has been correctly resolved
             if (options.conflict) {
               report.log(id, options.from_local ? LOG_FORCE_DELETE_REMOTE :
                                                   LOG_FORCE_DELETE_LOCAL);
@@ -10373,8 +10383,7 @@ return new Parser;
               });
           }
           report.log(id, options.from_local ? LOG_UNEXPECTED_REMOTE_ATTACHMENT :
-                                              LOG_UNEXPECTED_LOCAL_ATTACHMENT,
-                     JSON.stringify(attachment_dict));
+                                              LOG_UNEXPECTED_LOCAL_ATTACHMENT);
         }, function (error) {
           if ((error instanceof jIO.util.jIOError) &&
               (error.status_code === 404)) {

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml

@@ -234,7 +234,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>976.64445.43971.20480</string> </value>
+                <value> <string>977.17610.605.30924</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1562768744.52</float>
+                        <float>1563892822.4</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js

@@ -10340,7 +10340,8 @@ return new Parser;
     // ie, replication should prevent losing user data
     // Synchronize attachments before, to ensure
     // all of them will be deleted too
-    var result;
+    var result,
+      previous_report_length;
     if (context._signature_hash_key !== undefined) {
       if (options.conflict) {
         report.log(id, options.from_local ? LOG_FORCE_DELETE_REMOTE :
@@ -10354,12 +10355,21 @@ return new Parser;
           return context._signature_sub_storage.remove(id);
         });
     } else {
+      previous_report_length = report._list.length;
       result = repairDocumentAttachment(context, id, report)
         .push(function () {
-          return destination.allAttachments(id);
-        })
-        .push(function (attachment_dict) {
-          if (JSON.stringify(attachment_dict) === "{}") {
+          var next_report_length = report._list.length,
+            has_error = false,
+            i;
+          // Check if there was an error during attachment replication
+          for (i = previous_report_length; i < next_report_length; i += 1) {
+            if ((report._list[i][1] === id) &&
+                (report._list[i][0] < 100)) {
+              has_error = true;
+            }
+          }
+          if (!has_error) {
+            // Attachment repication has been correctly resolved
             if (options.conflict) {
               report.log(id, options.from_local ? LOG_FORCE_DELETE_REMOTE :
                                                   LOG_FORCE_DELETE_LOCAL);
@@ -10373,8 +10383,7 @@ return new Parser;
               });
           }
           report.log(id, options.from_local ? LOG_UNEXPECTED_REMOTE_ATTACHMENT :
-                                              LOG_UNEXPECTED_LOCAL_ATTACHMENT,
-                     JSON.stringify(attachment_dict));
+                                              LOG_UNEXPECTED_LOCAL_ATTACHMENT);
         }, function (error) {
           if ((error instanceof jIO.util.jIOError) &&
               (error.status_code === 404)) {