Commit 395512f0a81baba7f158aeb4aa964eb8e704dd1c

Authored by Victor Costa
1 parent 713668ea

Set restangular full response to trueby default

src/app/components/noosfero-articles/blog/blog.directive.js
@@ -22,21 +22,20 @@ @@ -22,21 +22,20 @@
22 return directive; 22 return directive;
23 23
24 /** @ngInject */ 24 /** @ngInject */
25 - function BlogController(noosfero, Restangular) { 25 + function BlogController(noosfero) {
26 var vm = this; 26 var vm = this;
27 vm.posts = []; 27 vm.posts = [];
28 vm.perPage = 3; 28 vm.perPage = 3;
29 vm.currentPage = 1; 29 vm.currentPage = 1;
30 30
31 vm.loadPage = function() { 31 vm.loadPage = function() {
32 - Restangular.setFullResponse(true);  
33 noosfero.articles.one(vm.article.id).customGET('children', { 32 noosfero.articles.one(vm.article.id).customGET('children', {
34 content_type: 'TinyMceArticle', 33 content_type: 'TinyMceArticle',
35 per_page: vm.perPage, 34 per_page: vm.perPage,
36 page: vm.currentPage 35 page: vm.currentPage
37 - }).then(function(result) {  
38 - vm.totalPosts = result.headers('total');  
39 - vm.posts = result.data.articles; 36 + }).then(function(response) {
  37 + vm.totalPosts = response.headers('total');
  38 + vm.posts = response.data.articles;
40 }); 39 });
41 } 40 }
42 vm.loadPage(); 41 vm.loadPage();
src/app/components/noosfero-blocks/members-block/members-block.directive.js
@@ -26,8 +26,8 @@ @@ -26,8 +26,8 @@
26 var vm = this; 26 var vm = this;
27 vm.members = []; 27 vm.members = [];
28 28
29 - noosfero.members(noosfero.profiles.one(vm.owner.id)).one().get({per_page: 6}).then(function(result) {  
30 - vm.members = result.people; 29 + noosfero.members(noosfero.profiles.one(vm.owner.id)).one().get({per_page: 6}).then(function(response) {
  30 + vm.members = response.data.people;
31 }); 31 });
32 } 32 }
33 } 33 }
src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 33
34 var limit = vm.block.settings.limit || 5; 34 var limit = vm.block.settings.limit || 5;
35 //FIXME get all text articles 35 //FIXME get all text articles
36 - noosfero.profiles.one(vm.profile.id).one('articles').get({content_type: 'TinyMceArticle', per_page: limit}).then(function(result) {  
37 - vm.documents = result.articles; 36 + noosfero.profiles.one(vm.profile.id).one('articles').get({content_type: 'TinyMceArticle', per_page: limit}).then(function(response) {
  37 + vm.documents = response.data.articles;
38 }); 38 });
39 } 39 }
40 } 40 }
src/app/content-viewer/content-viewer.controller.js
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 15
16 function activate() { 16 function activate() {
17 vm.profile = $scope.vm.owner; 17 vm.profile = $scope.vm.owner;
18 - noosfero.profiles.one(vm.profile.id).one('articles').get({path: $stateParams.page}).then(function(articles) {  
19 - vm.article = articles.article; 18 + noosfero.profiles.one(vm.profile.id).one('articles').get({path: $stateParams.page}).then(function(response) {
  19 + vm.article = response.data.article;
20 }); 20 });
21 } 21 }
22 } 22 }
src/app/index.config.js
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 $logProvider.debugEnabled(true); 10 $logProvider.debugEnabled(true);
11 $locationProvider.html5Mode({enabled: true}); 11 $locationProvider.html5Mode({enabled: true});
12 RestangularProvider.setBaseUrl('/api/v1'); 12 RestangularProvider.setBaseUrl('/api/v1');
  13 + RestangularProvider.setFullResponse(true);
13 $httpProvider.defaults.headers.post = {'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'}; 14 $httpProvider.defaults.headers.post = {'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'};
14 15
15 $provide.decorator('$uiViewScroll', function ($delegate, $document) { 16 $provide.decorator('$uiViewScroll', function ($delegate, $document) {
src/app/profile-info/profile-info.controller.js
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 15
16 function activate() { 16 function activate() {
17 vm.profile = $scope.vm.owner; 17 vm.profile = $scope.vm.owner;
18 - noosfero.profiles.one(vm.profile.id).one('activities').get().then(function(result) {  
19 - vm.activities = result.activities; 18 + noosfero.profiles.one(vm.profile.id).one('activities').get().then(function(response) {
  19 + vm.activities = response.data.activities;
20 }); 20 });
21 } 21 }
22 } 22 }
src/app/profile/profile-home.controller.js
@@ -13,9 +13,9 @@ @@ -13,9 +13,9 @@
13 13
14 function activate() { 14 function activate() {
15 vm.profile = $scope.vm.owner; 15 vm.profile = $scope.vm.owner;
16 - noosfero.profile(vm.profile.id).customGET('home_page', {fields: 'path'}).then(function(result) {  
17 - if(result.article) {  
18 - $state.transitionTo('main.profile.page', {page: result.article.path, profile: vm.profile.identifier}, {location: false}); 16 + noosfero.profile(vm.profile.id).customGET('home_page', {fields: 'path'}).then(function(response) {
  17 + if(response.data.article) {
  18 + $state.transitionTo('main.profile.page', {page: response.data.article.path, profile: vm.profile.identifier}, {location: false});
19 } else { 19 } else {
20 $state.transitionTo('main.profile.info', {profile: vm.profile.identifier}, {location: false}); 20 $state.transitionTo('main.profile.info', {profile: vm.profile.identifier}, {location: false});
21 } 21 }
src/app/profile/profile.controller.js
@@ -13,11 +13,11 @@ @@ -13,11 +13,11 @@
13 activate(); 13 activate();
14 14
15 function activate() { 15 function activate() {
16 - noosfero.profiles.one().get({identifier: $stateParams.profile}).then(function(profiles) {  
17 - vm.profile = profiles[0]; 16 + noosfero.profiles.one().get({identifier: $stateParams.profile}).then(function(response) {
  17 + vm.profile = response.data[0];
18 return noosfero.boxes(vm.profile.id).one().get(); 18 return noosfero.boxes(vm.profile.id).one().get();
19 }).then(function(response) { 19 }).then(function(response) {
20 - vm.boxes = response.boxes; 20 + vm.boxes = response.data.boxes;
21 }); 21 });
22 } 22 }
23 } 23 }
src/app/profile/profile.controller.spec.js
@@ -2,11 +2,11 @@ @@ -2,11 +2,11 @@
2 'use strict'; 2 'use strict';
3 3
4 describe('controllers', function(){ 4 describe('controllers', function(){
5 - var vm; 5 + // var vm;
6 6
7 beforeEach(module('angular')); 7 beforeEach(module('angular'));
8 - beforeEach(inject(function(_$controller_) {  
9 - vm = _$controller_('MainController'); 8 + beforeEach(inject(function() {
  9 + // vm = _$controller_('MainController');
10 })); 10 }));
11 }); 11 });
12 })(); 12 })();