Author: echatellier Date: 2014-06-09 19:25:26 +0200 (Mon, 09 Jun 2014) New Revision: 164 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/164 Log: Rappels des charg?\195?\169s de clientelle, adresse de r?\195?\169ponse, domaine de r?\195?\169ponse des dossiers parents 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-09 17:16:45 UTC (rev 163) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 17:25:26 UTC (rev 164) @@ -371,6 +371,14 @@ </tr> </thead> <tbody> + <tr ng-repeat="customerResponsible in parentScopeValues.customerResponsibles" class="parentInfos"> + <td> + <span class="fa fa-user"></span> + {{customerResponsible.firstName}} {{customerResponsible.lastName}}</td> + <td> + + </td> + </tr> <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles"> <td> <span class="fa fa-user"></span> @@ -420,6 +428,14 @@ </tr> </thead> <tbody> + <tr ng-repeat="replyAddress in parentScopeValues.replyAddresses" class="parentInfos"> + <td> + <span class="glyphicon glyphicon-user"></span> + {{replyAddress}}</td> + <td> + + </td> + </tr> <tr ng-repeat="replyAddress in selectedMailFolder.replyAddresses track by $index"> <td> <span class="glyphicon glyphicon-user"></span> @@ -458,6 +474,14 @@ </tr> </thead> <tbody> + <tr ng-repeat="replyDomain in parentScopeValues.replyDomains" class="parentInfos"> + <td> + <span class="glyphicon glyphicon-globe"></span> + {{replyDomain}}</td> + <td> + + </td> + </tr> <tr ng-repeat="replyDomain in selectedMailFolder.replyDomains track by $index"> <td> <span class="glyphicon glyphicon-globe"></span> @@ -595,7 +619,7 @@ </tr> </thead> <tbody> - <tr ng-repeat="user in parentScopeValues.parentsWriteRightUsers" class="parentInfos"> + <tr ng-repeat="user in parentScopeValues.writeRightUsers" class="parentInfos"> <td> <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} </td> @@ -605,7 +629,7 @@ <label><input type="checkbox" disabled> Déplacement</label> </td> </tr> - <tr ng-repeat="group in parentScopeValues.parentsWriteRightGroups" class="parentInfos"> + <tr ng-repeat="group in parentScopeValues.writeRightGroups" class="parentInfos"> <td> <span class="fa fa-users"></span> {{group.fullPath}} </td> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 17:16:45 UTC (rev 163) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 17:25:26 UTC (rev 164) @@ -341,18 +341,24 @@ $scope.selectedMailFolder.allowMoveDemandIntoFolder = $scope.selectedMailFolder.allowMoveDemandIntoFolder || false; $scope.selectedMailFolder.openAttachmentReportNoTaken = $scope.selectedMailFolder.openAttachmentReportNoTaken || false; $scope.selectedMailFolder.printActionEqualTakeAction = $scope.selectedMailFolder.printActionEqualTakeAction || false; - $scope.selectedMailFolder.refuseMail = $scope.selectedMailFolder.refuseMail || false; $scope.selectedMailFolder.rejectUnknownSender = $scope.selectedMailFolder.rejectUnknownSender || false; } // initilaisation des valeurs du parent $scope.parentScopeValues = { - parentsReadRightUsers: [], - parentsReadRightGroups: [], - parentsWriteRightUsers: [], - parentsWriteRightGroups: [], - parentsMoveRightUsers: [], - parentsMoveRightGroups: [] + customerResponsibles: [], + replyAddresses: [], + replyDomains: [], + folderActions: [], + folderTableColumns: [], + etatAttente: [], + //rigths + readRightUsers: [], + readRightGroups: [], + writeRightUsers: [], + writeRightGroups: [], + moveRightUsers: [], + moveRightGroups: [] }; updateParentScopeValues($scope.selectedMailFolder.$parent); } @@ -373,36 +379,58 @@ if (angular.isUndefined($scope.parentScopeValues.printActionEqualTakeAction)) { $scope.parentScopeValues.printActionEqualTakeAction = folder.printActionEqualTakeAction; } - if (angular.isUndefined($scope.parentScopeValues.refuseMail)) { - $scope.parentScopeValues.refuseMail = folder.refuseMail; - } if (angular.isUndefined($scope.parentScopeValues.rejectUnknownSender)) { $scope.parentScopeValues.rejectUnknownSender = folder.rejectUnknownSender; } + if ($scope.parentScopeValues.faxDomain) { + $scope.parentScopeValues.faxDomain = folder.faxDomain; + } + if ($scope.parentScopeValues.ediFolder) { + $scope.parentScopeValues.ediFolder = folder.ediFolder; + } + if ($scope.parentScopeValues.folderActions) { + $scope.parentScopeValues.folderActions = folder.folderActions; + } + if ($scope.parentScopeValues.folderTableColumns) { + $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; + } + if ($scope.parentScopeValues.etatAttente) { + $scope.parentScopeValues.etatAttente = folder.etatAttente; + } // move to parent first to keed parent order for collection if (folder.$parent) { updateParentScopeValues(folder.$parent); }; + // parents values + if (folder.customerResponsibles) { + $scope.parentScopeValues.customerResponsibles = $scope.parentScopeValues.customerResponsibles.concat(folder.customerResponsibles); + } + if (folder.replyAddresses) { + $scope.parentScopeValues.replyAddresses = $scope.parentScopeValues.replyAddresses.concat(folder.replyAddresses); + } + if (folder.replyDomains) { + $scope.parentScopeValues.replyDomains = $scope.parentScopeValues.replyDomains.concat(folder.replyDomains); + } // manage rigths if (folder.readRightUsers) { - $scope.parentScopeValues.parentsWriteRightUsers = $scope.parentScopeValues.parentsReadRightUsers.concat(folder.readRightUsers); + $scope.parentScopeValues.readRightUsers = $scope.parentScopeValues.readRightUsers.concat(folder.readRightUsers); } if (folder.readRightGroups) { - $scope.parentScopeValues.parentsWriteRightGroups = $scope.parentScopeValues.parentsReadRightGroups.concat(folder.readRightGroups); + $scope.parentScopeValues.readRightGroups = $scope.parentScopeValues.readRightGroups.concat(folder.readRightGroups); } if (folder.writeRightUsers) { - $scope.parentScopeValues.parentsWriteRightUsers = $scope.parentScopeValues.parentsWriteRightUsers.concat(folder.writeRightUsers); + $scope.parentScopeValues.writeRightUsers = $scope.parentScopeValues.writeRightUsers.concat(folder.writeRightUsers); } if (folder.writeRightGroups) { - $scope.parentScopeValues.parentsWriteRightGroups = $scope.parentScopeValues.parentsWriteRightGroups.concat(folder.writeRightGroups); + $scope.parentScopeValues.writeRightGroups = $scope.parentScopeValues.writeRightGroups.concat(folder.writeRightGroups); } if (folder.moveRightUsers) { - $scope.parentScopeValues.parentsMoveRightUsers = $scope.parentScopeValues.parentsMoveRightUsers.concat(folder.moveRightUsers); + $scope.parentScopeValues.moveRightUsers = $scope.parentScopeValues.moveRightUsers.concat(folder.moveRightUsers); } if (folder.moveRightGroups) { - $scope.parentScopeValues.parentsMoveRightGroups = $scope.parentScopeValues.parentsMoveRightGroups.concat(folder.moveRightGroups); + $scope.parentScopeValues.moveRightGroups = $scope.parentScopeValues.moveRightGroups.concat(folder.moveRightGroups); } } };