removed unnecessary method calls

js/erp5_loader.js

@@ -1990,7 +1990,7 @@
           if (props.left.image !== undefined) {
             target.appendChild(factory.generateElement(
               "img",
-              {"src": props.left.image, "alt": props.left.alt}
+              {"src": props.left.image, "alt": (props.left.alt || "")}
             ));
           }
           // custom icon
@@ -4251,7 +4251,6 @@
    * @param {object} reply Response from previous promise and pass-params
    * @return {object} response object/promise
    */
-  // TODO: remove when not needed anymore
   init.testStorageForData = function (reply) {
     var baggage = reply.baggage;
 
@@ -4259,10 +4258,11 @@
       baggage.fields = util.parseIfNeeded(reply.response);
     }
 
+    // try to get 1 record
     if (baggage.create !== false && baggage.config.initial_query) {
-      return init.testForSampleData({
+      return util.fetchData({
         "storage": "items",
-        "type": baggage.type,
+        "query": init.generateQueryObject({"limit": [0, 1]}, baggage.type),
         "baggage": baggage
       });
     }
@@ -4277,16 +4277,22 @@
    * @param {object} reply Response from previous promise and pass-params
    * @return {object} response object/promise
    */
-  // TODO: remove when not needed anymore
   init.retrieveSampleData = function (reply) {
     var baggage = reply.baggage;
 
     if (reply.response) {
       if (util.parseIfNeeded(reply.response).data.total_rows === 0) {
-        return init.fetchSampleData({
-          "type": baggage.config.portal_type_title,
-          "baggage": baggage
-        });
+        return jIO.util
+          .ajax({
+            "url": "data/" + baggage.config.portal_type_title + "_sample.json"
+          })
+          .then(function(e) {
+            return {
+              "response": e.target.response,
+              "baggage": baggage
+            };
+          })
+          .fail(util.errorHandler);
       }
     }
     return {
@@ -4294,23 +4300,56 @@
     };
   };
 
+
   /**
-   * Store retrieved sample data in storage
-   * @method storeSampleDataInStorage
-   * @param {object} reply Response from previous promise and pass-params
-   * @return {object} response object/promise
+   * Create Sample data entries for JIO
+   * @method storeSampleData
+   * @param {object} parcel object containing storage, type and baggage
+   * @return {object} promise object/baggage
    */
-  // TODO: remove when not needed anymore
   init.storeSampleDataInStorage = function (reply) {
-    var baggage = reply.baggage;
+    var i,
+      obj,
+      key,
+      promises,
+      record,
+      items,
+      store = init.storages["items"],
+      baggage = reply.baggage;
 
     if (reply.response) {
-      return init.storeSampleData({
-        "items": util.parseIfNeeded(reply.response),
-        "type": baggage.type,
-        "storage": "items",
+      items = util.parseIfNeeded(reply.response);
+
+      if (store && items.length > 0) {
+        promises = [];
+        // loop over item and create a JIO record
+        for (i = 0; i < items.length; i += 1) {
+          record = items[i];
+          obj = {};
+          for (key in record) {
+            if (record.hasOwnProperty(key)) {
+              obj[key] = record[key];
+            }
+          }
+          // add portal type
+          obj.portal_type = baggage.type;
+          // post to JIO with generated id
+          promises[i] = store.post(obj);
+        }
+        return RSVP.all(promises)
+          .then(function () {
+            return {
+              "response": undefined,
+              "baggage": baggage
+            };
+          })
+          .fail(util.errorHandler);
+      }
+      // we may have no sample data!
+      return {
+        "response": undefined,
         "baggage": baggage
-      });
+      };
     }
     return {
       "baggage": baggage
@@ -4671,7 +4710,6 @@
         init.storages[store.application_name] =
         jIO.createJIO(store);
     }
-
     return RSVP.all(promises);
   };
 
@@ -4817,84 +4855,6 @@
       });
   };
 
-  /* ====================================================================== */
-  /*         SAMPLE DATA (remove once live data is available)               */
-  /* ====================================================================== */
-
-  /**
-   * Create Sample data entries for JIO
-   * @method storeSampleData
-   * @param {object} parcel object containing storage, type and baggage
-   * @return {object} promise object/baggage
-   */
-  init.storeSampleData = function (parcel) {
-    var i, obj, key, promises, record, store = init.storages[parcel.storage];
-
-    if (store && parcel.items && parcel.items.length) {
-      promises = [];
-      for (i = 0; i < parcel.items.length; i += 1) {
-        record = parcel.items[i];
-        obj = {};
-        for (key in record) {
-          if (record.hasOwnProperty(key)) {
-            obj[key] = record[key];
-          }
-        }
-        obj.portal_type = parcel.type;
-        promises[i] = store.post(obj);
-      }
-      return RSVP.all(promises)
-        .then(function () {
-          return {
-            "response": undefined,
-            "baggage": parcel.baggage
-          };
-        })
-        .fail(util.errorHandler);
-    }
-    // we may have no sample data!
-    return {
-      "response": undefined,
-      "baggage": parcel.baggage
-    };
-  };
-
-  /**
-   * Test if storage is empty
-   * @method testForSampleData
-   * @param {object} parcel object containing storage, type and baggage
-   * @return {object} promise object/baggage
-   */
-  init.testForSampleData = function (parcel) {
-    return util.fetchData({
-      "storage": parcel.storage,
-      "query": init.generateQueryObject({
-        "limit": [0, 1]
-      }, parcel.type),
-      "baggage": parcel.baggage
-    });
-  };
-
-  /**
-   * retrieve sample data from disk
-   * @method fetchSampleData
-   * @param {object} parcel Id of gadget to fetch sample data and baggage
-   * @return {object} promise object & baggage
-   */
-  init.fetchSampleData = function (parcel) {
-    return jIO.util
-      .ajax({
-        "url": "data/" + parcel.type + "_sample.json"
-      })
-      .then(function (e) {
-        return {
-          "response": e.target.response,
-          "baggage": parcel.baggage
-        };
-      })
-      .fail(util.errorHandler);
-  };
-
   /* ====================================================================== */
   /*                             ENTRY POINT                                */
   /* ====================================================================== */