diff --git a/src/app/components/noosfero-articles/blog/blog.directive.js b/src/app/components/noosfero-articles/blog/blog.directive.js index 01266e1..26b91bd 100644 --- a/src/app/components/noosfero-articles/blog/blog.directive.js +++ b/src/app/components/noosfero-articles/blog/blog.directive.js @@ -22,21 +22,20 @@ return directive; /** @ngInject */ - function BlogController(noosfero, Restangular) { + function BlogController(noosfero) { var vm = this; vm.posts = []; vm.perPage = 3; vm.currentPage = 1; vm.loadPage = function() { - Restangular.setFullResponse(true); noosfero.articles.one(vm.article.id).customGET('children', { content_type: 'TinyMceArticle', per_page: vm.perPage, page: vm.currentPage - }).then(function(result) { - vm.totalPosts = result.headers('total'); - vm.posts = result.data.articles; + }).then(function(response) { + vm.totalPosts = response.headers('total'); + vm.posts = response.data.articles; }); } vm.loadPage(); diff --git a/src/app/components/noosfero-blocks/members-block/members-block.directive.js b/src/app/components/noosfero-blocks/members-block/members-block.directive.js index 100f848..d07835a 100644 --- a/src/app/components/noosfero-blocks/members-block/members-block.directive.js +++ b/src/app/components/noosfero-blocks/members-block/members-block.directive.js @@ -26,8 +26,8 @@ var vm = this; vm.members = []; - noosfero.members(noosfero.profiles.one(vm.owner.id)).one().get({per_page: 6}).then(function(result) { - vm.members = result.people; + noosfero.members(noosfero.profiles.one(vm.owner.id)).one().get({per_page: 6}).then(function(response) { + vm.members = response.data.people; }); } } diff --git a/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js b/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js index a5adea8..2106893 100644 --- a/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js +++ b/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js @@ -33,8 +33,8 @@ var limit = vm.block.settings.limit || 5; //FIXME get all text articles - noosfero.profiles.one(vm.profile.id).one('articles').get({content_type: 'TinyMceArticle', per_page: limit}).then(function(result) { - vm.documents = result.articles; + noosfero.profiles.one(vm.profile.id).one('articles').get({content_type: 'TinyMceArticle', per_page: limit}).then(function(response) { + vm.documents = response.data.articles; }); } } diff --git a/src/app/content-viewer/content-viewer.controller.js b/src/app/content-viewer/content-viewer.controller.js index 82a8edf..78b6157 100644 --- a/src/app/content-viewer/content-viewer.controller.js +++ b/src/app/content-viewer/content-viewer.controller.js @@ -15,8 +15,8 @@ function activate() { vm.profile = $scope.vm.owner; - noosfero.profiles.one(vm.profile.id).one('articles').get({path: $stateParams.page}).then(function(articles) { - vm.article = articles.article; + noosfero.profiles.one(vm.profile.id).one('articles').get({path: $stateParams.page}).then(function(response) { + vm.article = response.data.article; }); } } diff --git a/src/app/index.config.js b/src/app/index.config.js index 723d745..2568e98 100644 --- a/src/app/index.config.js +++ b/src/app/index.config.js @@ -10,6 +10,7 @@ $logProvider.debugEnabled(true); $locationProvider.html5Mode({enabled: true}); RestangularProvider.setBaseUrl('/api/v1'); + RestangularProvider.setFullResponse(true); $httpProvider.defaults.headers.post = {'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'}; $provide.decorator('$uiViewScroll', function ($delegate, $document) { diff --git a/src/app/profile-info/profile-info.controller.js b/src/app/profile-info/profile-info.controller.js index ca39e9e..d42806d 100644 --- a/src/app/profile-info/profile-info.controller.js +++ b/src/app/profile-info/profile-info.controller.js @@ -15,8 +15,8 @@ function activate() { vm.profile = $scope.vm.owner; - noosfero.profiles.one(vm.profile.id).one('activities').get().then(function(result) { - vm.activities = result.activities; + noosfero.profiles.one(vm.profile.id).one('activities').get().then(function(response) { + vm.activities = response.data.activities; }); } } diff --git a/src/app/profile/profile-home.controller.js b/src/app/profile/profile-home.controller.js index 3b65f41..b2c427b 100644 --- a/src/app/profile/profile-home.controller.js +++ b/src/app/profile/profile-home.controller.js @@ -13,9 +13,9 @@ function activate() { vm.profile = $scope.vm.owner; - noosfero.profile(vm.profile.id).customGET('home_page', {fields: 'path'}).then(function(result) { - if(result.article) { - $state.transitionTo('main.profile.page', {page: result.article.path, profile: vm.profile.identifier}, {location: false}); + noosfero.profile(vm.profile.id).customGET('home_page', {fields: 'path'}).then(function(response) { + if(response.data.article) { + $state.transitionTo('main.profile.page', {page: response.data.article.path, profile: vm.profile.identifier}, {location: false}); } else { $state.transitionTo('main.profile.info', {profile: vm.profile.identifier}, {location: false}); } diff --git a/src/app/profile/profile.controller.js b/src/app/profile/profile.controller.js index 1efe387..7aca0db 100644 --- a/src/app/profile/profile.controller.js +++ b/src/app/profile/profile.controller.js @@ -13,11 +13,11 @@ activate(); function activate() { - noosfero.profiles.one().get({identifier: $stateParams.profile}).then(function(profiles) { - vm.profile = profiles[0]; + noosfero.profiles.one().get({identifier: $stateParams.profile}).then(function(response) { + vm.profile = response.data[0]; return noosfero.boxes(vm.profile.id).one().get(); }).then(function(response) { - vm.boxes = response.boxes; + vm.boxes = response.data.boxes; }); } } diff --git a/src/app/profile/profile.controller.spec.js b/src/app/profile/profile.controller.spec.js index a4f61f9..2951da4 100644 --- a/src/app/profile/profile.controller.spec.js +++ b/src/app/profile/profile.controller.spec.js @@ -2,11 +2,11 @@ 'use strict'; describe('controllers', function(){ - var vm; + // var vm; beforeEach(module('angular')); - beforeEach(inject(function(_$controller_) { - vm = _$controller_('MainController'); + beforeEach(inject(function() { + // vm = _$controller_('MainController'); })); }); })(); -- libgit2 0.21.2