Merge pull request #462 from magento-frontend/MAGETWO-58857

Bug - MAGETWO-58857 UI Grid won't load initial data until its state gets modified
magento · Oct 5, 2016 · eb50977 · eb50977
2 parents aba7790 + c05ebec
commit eb50977
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/provider.js b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
@@ -43,6 +43,10 @@ define([
                 .initStorage()
                 .clearData();
 
+            // Load data when there will
+            // be no more pending assets.
+            resolver(this.reload, this);
+
             return this;
         },
 
@@ -122,9 +126,11 @@ define([
          * Handles changes of 'params' object.
          */
         onParamsChange: function () {
-            this.firstLoad ?
-                resolver(this.reload, this) :
+            // It's necessary to make a reload only
+            // after the initial loading has been made.
+            if (!this.firstLoad) {
                 this.reload();
+            }
         },
 
         /**