Author: obruce Date: 2014-08-04 17:41:37 +0200 (Mon, 04 Aug 2014) New Revision: 3026 Url: http://forge.chorem.org/projects/jtimer/repository/revisions/3026 Log: Fix controller Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java branches/ng-jtimer/src/main/webapp/js/controllers.js Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java 2014-08-04 14:28:50 UTC (rev 3025) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java 2014-08-04 15:41:37 UTC (rev 3026) @@ -46,7 +46,7 @@ public Representation getTask() { String taskId = (String)getRequest().getAttributes().get("taskId"); Gson gson = new Gson(); - String json = gson.toJson(Long.valueOf(taskId).longValue()); + String json = gson.toJson(taskId); return new StringRepresentation( json , MediaType.APPLICATION_JSON); } Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java 2014-08-04 14:28:50 UTC (rev 3025) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java 2014-08-04 15:41:37 UTC (rev 3026) @@ -179,13 +179,6 @@ todoList.pushUpdatedTask(repr1); log.info("on dispatch update"); } - } - - - } - - - } Modified: branches/ng-jtimer/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-08-04 14:28:50 UTC (rev 3025) +++ branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-08-04 15:41:37 UTC (rev 3026) @@ -571,10 +571,10 @@ //On change la date au dernier acces task["modificationDate"]=Date.now(); - serverTaskAccess.create({dispatch:true}, angular.toJson(task), //TODO obruce 04/06/14 dispatch a enlever + serverTaskAccess.update({dispatch:true}, angular.toJson(task), //TODO obruce 04/06/14 dispatch a enlever function(){ console.log("persist task success" + task); - $scope.todo.stockedNewTasks.shift(); + $scope.todo.stockedEditedTasks.shift(); }, function(){ console.log("fail"); @@ -859,8 +859,8 @@ $scope.saveTask = function(node) { node.edit = null; - serverTaskAccess.update({taskId: node.task.taskId, dispatch:true}, function(){ - console.log("delete success" + task.taskId); + serverTaskAccess.update({dispatch:true}, angular.toJson(node.task) ,function(){ + console.log("update success" + node.task.taskId); }, function(){ console.log("fail");