Author: echatellier Date: 2014-06-04 16:53:59 +0200 (Wed, 04 Jun 2014) New Revision: 131 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/131 Log: refs #4662: Correction des actions contextuel des dossiers Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-04 14:43:27 UTC (rev 130) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-04 14:53:59 UTC (rev 131) @@ -406,9 +406,9 @@ </div> <div id="collapse5" class="panel-collapse collapse"> <div class="panel-body"> - <label class="checkbox" ng-repeat="(contextMailAction,label) in contextMailActions"> - <input type="checkbox" ng-checked="selectedMailFolder.contextActions.indexOf(contextMailAction) != -1" - ng-click="changeFolderAction(contextMailAction)"> {{label}} + <label class="checkbox" ng-repeat="(folderAction,label) in folderActions"> + <input type="checkbox" ng-checked="selectedMailFolder.folderActions.indexOf(folderAction) != -1" + ng-click="changeFolderAction(folderAction)"> {{label}} </label> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-04 14:43:27 UTC (rev 130) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-04 14:53:59 UTC (rev 131) @@ -249,7 +249,7 @@ angular.forEach($scope.selectedMailFolder.folderTableColumns, function(folderTableColumn) { $scope.folderTableColumns.push({ id: folderTableColumn, - label: $scope.fields[folderTableColumn] + label: $scope.mailFields[folderTableColumn] }); }); }; @@ -333,12 +333,12 @@ }; // selection/deselection d'une action possible du menu contextuel pour ce dossier - $scope.changeFolderAction = function(mailAction) { - var index = $scope.selectedMailFolder.contextActions.indexOf(mailAction); + $scope.changeFolderAction = function(folderAction) { + var index = $scope.selectedMailFolder.folderActions.indexOf(folderAction); if (index != -1) { - $scope.selectedMailFolder.contextActions.splice(index, 1); + $scope.selectedMailFolder.folderActions.splice(index, 1); } else { - $scope.selectedMailFolder.contextActions.push(mailAction); + $scope.selectedMailFolder.folderActions.push(folderAction); } }; }]);