Author: echatellier Date: 2014-05-28 11:37:42 +0200 (Wed, 28 May 2014) New Revision: 105 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/105 Log: refs #4662: Correction de l'affichage des filtres Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-28 09:27:47 UTC (rev 104) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-28 09:37:42 UTC (rev 105) @@ -251,13 +251,13 @@ var mailFilters = []; angular.forEach($scope.flatMailFolders(), function(mailFolder) { if (mailFolder.filters) { - mailFilters = mailFilters.concat(mailFolder.filters); - angular.forEach($scope.mailFilters, function(mailFilter) { + //mailFilters = mailFilters.concat(mailFolder.filters); + angular.forEach(mailFolder.filters, function(mailFilter) { // ca c'est pas propre, on modifie l'object original pour affichage - mailFilter.fmMailFolder = mailFolder; + mailFilter.fmMailFolder = {name:mailFolder.name}; - mailFilters.push(mailFolder); + mailFilters.push(mailFilter); }); } else { mailFolder.filters = []; @@ -268,7 +268,12 @@ // add new filter action $scope.addNewFilter = function() { - var filter = {expression: $scope.selectedFilter, fmMailFolder: $scope.selectedFolder}; + var filter = { + expression: $scope.selectedFilter, + fmMailFolder: { + name: $scope.selectedFolder.name + } + }; $scope.selectedFolder.filters.push(filter); // clear form