diff -r d0d0a893401d -r 8d016c195d79 client/app/slides/slides_controller.js --- a/client/app/slides/slides_controller.js Mon Mar 23 17:05:45 2015 +0100 +++ b/client/app/slides/slides_controller.js Mon Mar 23 17:07:36 2015 +0100 @@ -1,19 +1,18 @@ (function(){ - 'use strict'; + 'use strict'; - angular.module('ammicoSlides',['ngResource', 'ngRoute']) - .config(function ($routeProvider) { - $routeProvider - .when('/', { - templateUrl: 'slides/slides.html', - controller: 'slidesCtrl' - }); - }) - .controller('slidesCtrl', function($scope, booksModel, $routeParams){ - console.log(booksModel.slides[$routeParams.idSlide]); - $scope.slide = booksModel.slides[$routeParams.idSlide]; - }) - .controller('slideEditCtrl', function(){ - }); + angular.module('ammicoSlides',['ngResource', 'ngRoute']) + .controller('slidesCtrl', function($scope, $routeParams, searchApi, $sce){ + + $scope.slide = searchApi.slide.get({idSlide:$routeParams.idSlide, format:'json'}, function(data){ + data.details.description = $sce.trustAsHtml(data.details.description); + }); + + console.log($routeParams.idSlide); + console.log($scope); + //$scope.slide = booksModel.slides[$routeParams.idSlide]; + }) + .controller('slideEditCtrl', function(){ + }); })();