Merge branch 'develop'

Author: Phocacius

CHANGELOG.md

@@ -1,5 +1,8 @@
+## 2.0.1
+* Enable immediate update of the feature table in the data manager ([PR#130](https://github.com/mapbender/mapbender-digitizer/pull/130))
+
 ## 2.0.0
-* Remove bug that allowed a feature to revert to a status it had before the last save. ([PR#123] https://github.com/mapbender/mapbender-digitizer/pull/123)
+* Remove bug that allowed a feature to revert to a status it had before the last save. ([PR#123](https://github.com/mapbender/mapbender-digitizer/pull/123))
 * Prevent Draw Donut On Non-Digitizer Features ([PR#120](https://github.com/mapbender/mapbender-digitizer/pull/120))
 * Prevent self intersection of polygons not only on modification, but on creation as well ([PR#118](https://github.com/mapbender/mapbender-digitizer/pull/118))
 * Allow leaving modification mode on pressing escape ([PR#118](https://github.com/mapbender/mapbender-digitizer/pull/118))

src/Mapbender/DataManagerBundle/Resources/public/dataManager.element.js

@@ -367,7 +367,9 @@
          * @private
          */
         _afterSave: function(schema, dataItem, originalId, responseData) {
-            this._replaceItemData(schema, dataItem, responseData.dataItem);
+            if (responseData.dataItem) {
+                this._replaceItemData(schema, dataItem, responseData.dataItem);
+            }
             if (!originalId) {
                 // new item
                 this.tableRenderer.addRow(dataItem, true);
@@ -432,7 +434,7 @@
          * @private
          */
         _replaceItemData: function(schema, dataItem, newValues) {
-            Object.assign(dataItem.properties, newValues);
+            Object.assign(dataItem.properties, newValues.properties);
         },
         /**
          * Open edit feature dialog
@@ -731,7 +733,7 @@
                 options_.data = JSON.stringify(data);
             }
             this.$loadingIndicator_.css({opacity: 1});
-            return this.decorateXhr_($.ajax(options_, this.$loadingIndicator_));
+            return this.decorateXhr_($.ajax(options_), this.$loadingIndicator_);
         },
         decorateXhr_: function(jqXhr, $loadingIndicator) {
             if ($loadingIndicator) {