| commit | b81718b34c9a33afef429b5742d3dc00dcdaca01 | [log] [tgz] |
|---|---|---|
| author | Arpit Agarwal <arpiagariu@gmail.com> | Tue Jul 12 14:06:55 2016 -0700 |
| committer | Arpit Agarwal <arpiagariu@gmail.com> | Tue Jul 12 14:06:55 2016 -0700 |
| tree | 799813d6491ac8698f7a7d8c9165977433978fc2 | |
| parent | b01448e8e74bbdef97db5d15c6d0bbd1145a2e8f [diff] |
Update return value in Me.js Change-Id: I2f395569550af9a004e657b994a14310cecdfe4f
diff --git a/views/ngXosLib/xosHelpers/src/services/rest/Me.js b/views/ngXosLib/xosHelpers/src/services/rest/Me.js index ff77060..5dd1043 100644 --- a/views/ngXosLib/xosHelpers/src/services/rest/Me.js +++ b/views/ngXosLib/xosHelpers/src/services/rest/Me.js
@@ -14,7 +14,7 @@ $http.get('/api/utility/me/') .then(res => { - deferred.resolve(res); + deferred.resolve(res.data); }) .catch(e => { deferred.reject(e);
diff --git a/views/ngXosViews/tenant/src/js/createslice.js b/views/ngXosViews/tenant/src/js/createslice.js index 933542e..a522e49 100644 --- a/views/ngXosViews/tenant/src/js/createslice.js +++ b/views/ngXosViews/tenant/src/js/createslice.js
@@ -252,10 +252,8 @@ } pr.then((users) => { this.model = users; - //data = users; - //this.model = this.users; this.config.feedback.show = true; - deferred.resolve(this.model); + deferred.resolve(users); }) .catch((e) => { this.config.feedback.show = true;
diff --git a/xos/core/xoslib/static/js/vendor/ngXosHelpers.js b/xos/core/xoslib/static/js/vendor/ngXosHelpers.js index 3184e0e..1e8426b 100644 --- a/xos/core/xoslib/static/js/vendor/ngXosHelpers.js +++ b/xos/core/xoslib/static/js/vendor/ngXosHelpers.js
@@ -2579,7 +2579,7 @@ var deferred = $q.defer(); $http.get('/api/utility/me/').then(function (res) { - deferred.resolve(res); + deferred.resolve(res.data); }).catch(function (e) { deferred.reject(e); });