Merge branch '2024.11'

tine-groupware · Nov 11, 2024 · fa11771 · fa11771
2 parents ae614fd + d385882
commit fa11771
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tine20/library/ExtJS/src/data/Store.js b/tine20/library/ExtJS/src/data/Store.js
@@ -1270,12 +1270,16 @@ myStore.reload(lastOptions);
         if (this.isDestroyed === true) {
             return;
         }
-        if (options && options.add !== true && ((options.transactionId && this.lastTransactionId !== options.transactionId) || this.fireEvent('beforeloadrecords', o, options, success, this) === false)) {
+        this.options = options;
+
+        if (options && options.add !== true
+            && ((options.transactionId && this.lastTransactionId !== options.transactionId) || this.fireEvent('beforeloadrecords', o, options, success, this) === false)
+        ) {
             // fire load event so loading indicator stops
             this.fireEvent('load', this, this.data.items, this.options);
             return;
         }
-        this.options = options;
+
         if(!o || success === false){
             if(success !== false){
                 this.fireEvent('load', this, [], options);