diff -r ccb586464a6f -r 10fd23382e76 client/app/books/books_controller.js --- a/client/app/books/books_controller.js Thu Apr 02 12:06:51 2015 +0200 +++ b/client/app/books/books_controller.js Thu Apr 02 13:11:12 2015 +0200 @@ -2,11 +2,8 @@ 'use strict'; angular.module('ammicoBooks',['ngRoute', 'ui.sortable']) - .service('booksModel', function(searchApi) { - this.books = searchApi.listBooks.query({format:'json'}); - }) - .controller('booksCtrl', function($scope, $location, booksModel, $modal){ - $scope.books = booksModel.books; + .controller('booksCtrl', function($scope, $location, booksModel, $modal, ammicoApi){ + $scope.books = ammicoApi.listBooks.query({format:'json'}); $scope.searchSubmit = function(){ $location.path('/search/' + $scope.q); }; @@ -18,8 +15,8 @@ }); }; }) - .controller('bookCtrl', function($scope, searchApi, $routeParams) { - $scope.slides = searchApi.booksSlides.query({idBook:$routeParams.idBook, format:'json'}); + .controller('bookCtrl', function($scope, ammicoApi, $routeParams) { + $scope.slides = ammicoApi.booksSlides.query({idBook:$routeParams.idBook, format:'json'}); $scope.slides.sort(function (a, b) { return a.orderIndex > b.orderIndex; }); @@ -28,24 +25,24 @@ var order = $scope.slides.map(function(i){ return i.id; }); - searchApi.order.save({idBook:$routeParams.idBook}, {order: order}); + ammicoApi.order.save({idBook:$routeParams.idBook}, {order: order}); } }; $scope.deleteItem = function(i){ if(0<=i && i<$scope.slides.length){ if(window.confirm('Êtes-vous sûr(e) de vouloir effacer cet élément ? Cette action est irrémédiable.')){ - searchApi.slide.delete({idSlide: $scope.slides[i].id}, function(){ + ammicoApi.slide.delete({idSlide: $scope.slides[i].id}, function(){ $scope.slides.splice(i, 1); }); } } }; }) - .controller('ModalAddBookCtrl', function ($scope, searchApi, $modalInstance) { + .controller('ModalAddBookCtrl', function ($scope, ammicoApi, $modalInstance) { $scope.add = function(){ - searchApi.listBooks.save({title: $scope.title}); + ammicoApi.listBooks.save({title: $scope.title}); $modalInstance.close(); };