Add more logic to service and routes

beeman · beeman · commit a11c9b6872df · 2015-02-09T04:52:57.000+01:00
diff --git a/client/app/modules/posts/config/posts.routes.js b/client/app/modules/posts/config/posts.routes.js
@@ -7,7 +7,8 @@ app.config(function ($stateProvider) {
     abstract: true,
     url: '/posts',
     templateUrl: 'modules/posts/views/main.html',
-    controller: 'PostsCtrl'
+    controller: 'PostsCtrl',
+    controllerAs: 'ctrl'
   }).state('app.posts.list', {
     url: '',
     templateUrl: 'modules/posts/views/list.html',
@@ -30,6 +31,13 @@ app.config(function ($stateProvider) {
   }).state('app.posts.view', {
     url: '/:id',
     templateUrl: 'modules/posts/views/view.html',
-    controller: 'PostsCtrl'
+    resolve: {
+      post: ['$stateParams', 'PostsService', function ($stateParams, PostsService) {
+        return PostsService.getPost($stateParams.id);
+      }]
+    },
+    controller: function ($scope, post) {
+      $scope.post = post;
+    }
   });
 });
diff --git a/client/app/modules/posts/controllers/posts.ctrl.js b/client/app/modules/posts/controllers/posts.ctrl.js
@@ -1,6 +1,19 @@
 'use strict';
 angular.module('com.module.posts')
-  .controller('PostsCtrl', function ($scope, $state, $stateParams, CoreService, gettextCatalog, PostsService, Post) {
+  .controller('PostsCtrl', function ($scope, $state, $stateParams, CoreService, FormHelper, gettextCatalog, Post, PostsService) {
+
+    $scope.delete = function (id) {
+      PostsService.deletePost(id, function () {
+        $state.reload();
+      });
+    };
+
+    this.formHelper = new FormHelper(Post);
+    $scope.cancel = function () {
+      console.log('Cancel');
+      console.log(this.formHelper);
+      //this.formHelper.cancel('app.posts.list');
+    };
 
     var postId = $stateParams.id;
 
@@ -15,19 +28,6 @@ angular.module('com.module.posts')
       $scope.post = {};
     }
 
-    $scope.delete = function (id) {
-      CoreService.confirm(gettextCatalog.getString('Are you sure?'), gettextCatalog.getString('Deleting this cannot be undone'), function () {
-        Post.deleteById(id, function () {
-          CoreService.toastSuccess(gettextCatalog.getString('Post deleted'), gettextCatalog.getString('Your post is deleted!'));
-          $state.reload();
-        }, function (err) {
-          CoreService.toastError(gettextCatalog.getString('Error deleting post'), gettextCatalog.getString('Your post is not deleted: ') + err);
-        });
-      }, function () {
-        return false;
-      });
-    };
-
     $scope.formFields = [
       {
         key: 'title',
diff --git a/client/app/modules/posts/services/posts.service.js b/client/app/modules/posts/services/posts.service.js
@@ -1,10 +1,32 @@
 'use strict';
 var app = angular.module('com.module.posts');
 
-app.service('PostsService', ['Post', function (Post) {
+app.service('PostsService', ['CoreService', 'gettextCatalog', 'Post', function (CoreService, gettextCatalog, Post) {
 
   this.getPosts = function () {
-    return Post.find().$promise;
+    return Post.find({
+      filter: {
+        order: 'created DESC'
+      }
+    }).$promise;
   };
 
+  this.getPost = function (id) {
+    return Post.findById({id: id}).$promise;
+  };
+
+  this.deletePost = function (id, cb) {
+    CoreService.confirm(gettextCatalog.getString('Are you sure?'), gettextCatalog.getString('Deleting this cannot be undone'), function () {
+      Post.deleteById(id, function () {
+        CoreService.toastSuccess(gettextCatalog.getString('Item deleted'), gettextCatalog.getString('Your item has been deleted!'));
+        cb();
+      }, function (err) {
+        CoreService.toastError(gettextCatalog.getString('Oops'), gettextCatalog.getString('Error deleting item: ') + err);
+        cb();
+      });
+    }, function () {
+      return false;
+    });
+  }
+
 }]);
