Author: garandel Date: 2014-05-12 14:15:44 +0200 (Mon, 12 May 2014) New Revision: 3930 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3930 Log: separe choices and poll Modified: trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js trunk/pollen-ui-angular/src/main/webapp/js/services.js Modified: trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-05-12 12:00:23 UTC (rev 3929) +++ trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-05-12 12:15:44 UTC (rev 3930) @@ -315,7 +315,7 @@ if ($scope.formValid) { var poll = angular.copy($scope.data.poll); poll.choice = angular.copy($scope.data.choices); - Poll.update({permission:$scope.data.poll.creator.permission.token}, poll, function (data) { + Poll.update({permission:$scope.data.poll.creator.permission.token, cmd:'edit'}, poll, function (data) { $scope.globalVariables.saved = true; }, function (error) { console.log(error); Modified: trunk/pollen-ui-angular/src/main/webapp/js/services.js =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/js/services.js 2014-05-12 12:00:23 UTC (rev 3929) +++ trunk/pollen-ui-angular/src/main/webapp/js/services.js 2014-05-12 12:15:44 UTC (rev 3930) @@ -27,18 +27,13 @@ .factory('Poll', ['$resource', 'BaseUrl', function ($resource, BaseUrl) { var transformParam = function (data) { - var obj = angular.copy(data); - delete obj.creator; - delete obj.$promise; - delete obj.$resolved; - delete obj.choice[0].creator; - - console.log(obj); - - return 'poll='+encodeURIComponent(JSON.stringify(obj)); + var poll = angular.copy(data); + delete poll.choice; + var choices = angular.copy(data.choice); + return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices)); }; - return $resource(BaseUrl+'/polls/:pollId:cmd', {pollId:'@topiaId'}, { + return $resource(BaseUrl+'/polls/:pollId/:cmd', {pollId:'@topiaId'}, { 'add' : { method : 'POST', transformRequest : function (data, headersGetter) { @@ -46,7 +41,7 @@ } }, 'update' : { - method : 'PUT', + method : 'POST', transformRequest : function (data, headersGetter) { return transformParam(data); }