Author: garandel Date: 2014-05-09 11:13:15 +0200 (Fri, 09 May 2014) New Revision: 3926 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3926 Log: fix popup setting 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-09 05:53:25 UTC (rev 3925) +++ trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-05-09 09:13:15 UTC (rev 3926) @@ -159,41 +159,41 @@ } var PollPopupSettingsCtrl = function ($scope, $filter, $modalInstance, poll) { - $scope.data.poll = poll; - $scope.data.toDay = new Date(); + $scope.poll = poll; + $scope.toDay = new Date(); - $scope.$watch('data.poll.beginDate', function() { - if (data.poll.beginChoiceDate) { - if (data.poll.beginChoiceDate < data.poll.beginDate) { - data.poll.beginChoiceDate = data.poll.beginDate; + $scope.$watch('poll.beginDate', function() { + if (poll.beginChoiceDate) { + if (poll.beginChoiceDate < poll.beginDate) { + poll.beginChoiceDate = poll.beginDate; } } else { - data.poll.beginChoiceDate = data.poll.beginDate; + poll.beginChoiceDate = poll.beginDate; } }); - $scope.$watch('data.poll.endDate', function() { - if (data.poll.endChoiceDate) { - if (data.poll.endChoiceDate > data.poll.endDate) { - data.poll.endChoiceDate = data.poll.endDate; + $scope.$watch('poll.endDate', function() { + if (poll.endChoiceDate) { + if (poll.endChoiceDate > poll.endDate) { + poll.endChoiceDate = poll.endDate; } } else { - data.poll.endChoiceDate = data.poll.endDate; + poll.endChoiceDate = poll.endDate; } }); if (!angular.isDefined($scope.poll.continuousResults)) { - $scope.data.poll.continuousResults = false; + $scope.poll.continuousResults = false; } if (!angular.isDefined($scope.poll.resultVisibility)) { - $scope.data.poll.resultVisibility = 'EVERYBODY'; + $scope.poll.resultVisibility = 'EVERYBODY'; } if (!angular.isDefined($scope.poll.choiceAddAllowed)) { - $scope.data.poll.choiceAddAllowed = false; + $scope.poll.choiceAddAllowed = false; } $scope.close = function () { @@ -268,7 +268,10 @@ $scope.save = function () { if ($scope.formValid) { - $scope.data.poll.$update({permission:$scope.data.poll.creator.permission.token}, function () { + + 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) { $scope.globalVariables.saved = true; }); } Modified: trunk/pollen-ui-angular/src/main/webapp/js/services.js =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/js/services.js 2014-05-09 05:53:25 UTC (rev 3925) +++ trunk/pollen-ui-angular/src/main/webapp/js/services.js 2014-05-09 09:13:15 UTC (rev 3926) @@ -42,9 +42,6 @@ transformRequest : function (data, headersGetter) { return transformParam(data); } - }, - 'delete' : { - method : 'DELETE' } }); }])