Use response extractor to avoid overriding fields

Fixes #273
marmelab · Feb 3, 2015 · 468cd88 · 468cd88
1 parent fcb7666
commit 468cd88
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/javascripts/ng-admin/Crud/CrudModule.js b/src/javascripts/ng-admin/Crud/CrudModule.js
@@ -80,6 +80,26 @@ define(function (require) {
         return require('nprogress');
     });
 
+    CrudModule.config(['RestangularProvider', function (RestangularProvider) {
+        // get response headers
+        RestangularProvider.setFullResponse(true);
+        // avoid Restangular to erase data by "restangularizing" elements
+        // @link https://github.com/mgonto/restangular/issues/100
+        RestangularProvider.setResponseExtractor(function(response) {
+          var newResponse = response;
+          if (angular.isArray(response)) {
+            newResponse.originalData = [];
+            angular.forEach(newResponse, function(value, key) {
+               newResponse.originalData[key] = angular.copy(value);
+            });
+          } else {
+            newResponse.originalData = angular.copy(response);
+          }
+
+          return newResponse;
+        });
+    }]);
+
     /**
      * Date Picker patch
      * https://github.com/angular-ui/bootstrap/commit/42cc3f269bae020ba17b4dcceb4e5afaf671d49b

diff --git a/src/javascripts/ng-admin/Crud/repository/Queries.js b/src/javascripts/ng-admin/Crud/repository/Queries.js
@@ -14,8 +14,6 @@ define(function () {
         this.$q = $q;
         this.Restangular = Restangular;
         this.config = Configuration();
-
-        this.Restangular.setFullResponse(true);  // To get also the headers
     }
 
     Queries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];

diff --git a/src/javascripts/ng-admin/Crud/repository/RetrieveQueries.js b/src/javascripts/ng-admin/Crud/repository/RetrieveQueries.js
@@ -28,7 +28,7 @@ define(function (require) {
             .oneUrl(view.entity.name(), this.config.getRouteFor(view, entityId))
             .get()
             .then(function (response) {
-                return view.mapEntry(response.data);
+                return view.mapEntry(response.data.originalData);
             });
     };
 
@@ -115,7 +115,11 @@ define(function (require) {
         // Get grid data
         return this.Restangular
             .allUrl(listView.entity.name(), this.config.getRouteFor(listView))
-            .getList(params);
+            .getList(params)
+            .then(function(response) {
+                response.data = response.data.originalData;
+                return response;
+            });
     };
 
     /**

diff --git a/src/javascripts/test/mock/Restangular.js b/src/javascripts/test/mock/Restangular.js
@@ -17,7 +17,7 @@ define('mock/Restangular', [
         getList:    function() { return mixins.buildPromise({}); },
         customPOST: function() { return mixins.buildPromise({}); },
         customPUT:  function() { return mixins.buildPromise({}); },
-        customDELETE: function() { return mixins.buildPromise({}); },
+        customDELETE: function() { return mixins.buildPromise({}); }
     };
 
     return Restangular;