[Commits] r2674 - sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/widgets

[commits at geoext.org]

Author: adube
Date: 2011-05-11 17:32:16 +0200 (Wed, 11 May 2011)
New Revision: 2674

Modified:
   sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/widgets/WFSTFeatureEditingManager.js
Log:
WFSTFeatureEditing - triggerCancelOnCommitSuccess property removed, was causing too many issues

Modified: sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/widgets/WFSTFeatureEditingManager.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/widgets/WFSTFeatureEditingManager.js	2011-05-11 14:53:31 UTC (rev 2673)
+++ sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/widgets/WFSTFeatureEditingManager.js	2011-05-11 15:32:16 UTC (rev 2674)
@@ -92,8 +92,6 @@
 
     ignoredAttributes: {name:["the_geom", "id", "gid", "fid"]},
 
-    triggerCancelOnCommitSuccess: false,
-
 /* PRIVATE*/
 
     mainPanel: null,
@@ -563,9 +561,7 @@
             listeners: {
                 done: function(panel, e) {
                     var feature = e.feature, modified = e.modified;
-                    this.manager.triggerCancelOnCommitSuccess &&
-                        this.manager.closeEditing(
-                            this.layer, {skipReturn: true});
+                    this.manager.closeEditing(this.layer, {skipReturn: true});
                     this.manager.commitFeature(feature);
                 },
                 cancel: function(panel, e) {
@@ -715,20 +711,7 @@
         var wfstFE = this.layer.wfstFeatureEditing;
         wfstFE.wmsLayerSibling && wfstFE.wmsLayerSibling.redraw(true);
 
-        // whether to cancel the editing (thus unselecting the current feature)
-        // OR not (keep current feature selected, thus keeping current feature
-        // editor grid opened)
-        if (this.manager.triggerCancelOnCommitSuccess) {
-            this.manager.cancelEditing(this.layer);
-        } else {
-            // We keep the current editor grid opened, so dirty properties must
-            // be cleaned : remove red flags from dirty records and reset
-            // editorGrid 'dirty' property
-            wfstFE.editorGrid.getStore().each(function(record){
-                record.dirty && record.commit();
-            });
-            wfstFE.editorGrid.dirty = false;
-        }
+        this.manager.cancelEditing(this.layer);
 
         // bug : there is currently a bug with newly inserted features... the
         //       record in the grid is invalid...
@@ -744,8 +727,7 @@
             }
         }
 
-        if (this.manager.triggerCancelOnCommitSuccess &&
-            this.manager.useFilter &&
+        if (this.manager.useFilter &&
             wfstFE.featureGrid.store.getCount() <= 1) {
             this.manager.returnToSelection(this.layer);
         }