Fix save of a filtered TT / Catalog (#9392)

Benjamin Renard
1 parent b1fab76f
Showing 2 changed files with 24 additions and 8 deletions Show diff stats
js/app/views/CatalogUI.js
js/app/views/TimeTableUI.js
@@ -126,13 +126,18 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             Ext.Msg.confirm('Generate TT', 'Current Catalog has been modified.\nDo you want to save it to include these changes in the generated Time Table ?',
                     function (btn, text) {
                         if (btn == 'yes') {
+			    var me = this;
                             // mark this.closed as true before the call to close() as that will fire the beforeclose event again
                             if (this.object.get('id') == "") {
                                 // case of creation of catalog
-                                this.saveCatalog(true, true);
+                                this.saveCatalog(function () {
+					me.createTT(me.object.get('id'));
+				}, true);
                             } else {
                                 // casse existing catalog
-                                this.saveProcess(false, true, true);
+                                this.saveProcess(false, function () {
+					me.createTT(me.object.get('id'));
+				}, true);
                             }
                             return;
                         }
@@ -534,6 +539,13 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                         me.updateCount();
                         //Statistical plugin
                         this.fireEvent("refresh");
+                    },
+                    prefetch: function (store, records, successful, operation, eOpts) {
+                        if (operation && (operation.action == 'read'))
+                        {
+                            if (operation.response && operation.response.result && operation.response.result.success)
+                                me.status = operation.response.result.status;
+                        }
                     }
                 }
             });
@@ -546,7 +558,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
         me.TTGrid.getSelectionModel().deselectAll();
         //
         //         	// clear filters
-        //         	me.TTGrid.getStore().clearFilter(true);
+        if (me.TTGrid.filters) {
+            me.TTGrid.getStore().clearFilter(true);
+            me.TTGrid.filters.clearFilters();
+        }
+
         //
         // clear sort
         me.TTGrid.getStore().sorters.clear();
@@ -622,11 +638,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             this.object = obj;
             module.linkedNode.create({notDisplayMsg: notDisplayMsg, callback: function () {
                     if (onAfterSave)
-                        this.createTT(this.object.get('id'));
+                        onAfterSave();
                 }, scope: this});
         }
         // if the name has been modified this is a creation
-        else if (this.fclose()) {
+        else if (this.fclose() || this.status && (this.status.nbFiltered > 0)) {
             if (this.object.isModified('name') || this.object.get('fromPlugin')) {
                 // if object already has an id : it's a 'rename' of an existing
                 if (this.object.get('id')) {
@@ -648,14 +664,14 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 module.linkedNode.create({callback: function () {
                         module.linkedNode.update({notDisplayMsg: notDisplayMsg, callback: function () {
                                 if (onAfterSave)
-                                    this.createTT(this.object.get('id'));
+                                    onAfterSave();
                             }, scope: this}, "", notDisplayMsg);
                     }, scope: this});
             } else {
                 //update
                 module.linkedNode.update({notDisplayMsg: notDisplayMsg, callback: function () {
                         if (onAfterSave)
-                            this.createTT(this.object.get('id'));
+                            onAfterSave();
                     }, scope: this});
             }
         }
@@ -194,7 +194,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
             // synchronisation of objects
             this.object = ttobj;
             timeTableModule.linkedNode.create();
-        } else if (this.fclose()) /*TimeTable object has been modified*/
+        } else if (this.fclose() || this.status && (this.status.nbFiltered > 0)) /*TimeTable object has been modified*/
         {
             if (this.object.isModified('name') || this.object.get('fromPlugin'))
             {