Merge branch 'master' into greenkeeper/update-all

toutpt · Nov 21, 2016 · ae17447 · ae17447
2 parents d80bbd0 + 9a51522
commit ae17447
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/api/api.service.js b/src/api/api.service.js
@@ -102,6 +102,8 @@ class OSMAPI {
         _config.method = 'PUT';
         _config.path = method;
         _config.data = this.osmx2js.js2xml(content);
+        _config.options = {};
+        _config.options.header = {"Content-Type": "text/xml"};
         return this.xhr(_config);
     }
     /**

diff --git a/src/oauth/oauth.service.js b/src/oauth/oauth.service.js
@@ -51,8 +51,8 @@ class OAuthAdapter{
         var deferred = this.$q.defer();
         options.path = '/api' + options.path;
         if (options.data) {
-            options.body = options.data;
-            options.data = undefined;
+            options.content = options.data;
+            delete options.data;
         }
         this.auth.xhr(options, function (err, data) {
             if (err) {