- Faxtomail-commits - mailman.cloud.codelutin.com

r174 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 10:20:56 +0200 (Tue, 10 Jun 2014) New Revision: 174 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/174 Log: Init boolean value for new nodes 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-06-10 08:14:35 UTC (rev 173) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-10 08:20:56 UTC (rev 174) @@ -279,7 +279,12 @@ var newNode = { topiaId: "new_" + guid(), name: name, - children: [] + children: [], + useCurrentLevelEtatAttente: false, + useCurrentLevelTableColumns: false, + useCurrentLevelFaxDomain: false, + useCurrentLevelFolderActions: false, + useCurrentLevelEdiFolder: false }; // extend node (in faxtomail collapsed = extended) scope.collapse();

1 0

r173 - in trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web: . action
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 10:14:35 +0200 (Tue, 10 Jun 2014) New Revision: 173 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/173 Log: Introduce demo user for session Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 08:13:08 UTC (rev 172) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 08:14:35 UTC (rev 173) @@ -128,17 +128,19 @@ @Override public void contextDestroyed(ServletContextEvent sce) { - if (log.isInfoEnabled()) { + if (scheduler != null) { if (log.isInfoEnabled()) { - log.info("Stopping quartz sheduler"); + if (log.isInfoEnabled()) { + log.info("Stopping quartz sheduler"); + } } - } - - try { - scheduler.shutdown(); - } catch (SchedulerException e) { - if (log.isWarnEnabled()) { - log.warn("Can't stop quartz", e); + + try { + scheduler.shutdown(); + } catch (SchedulerException e) { + if (log.isWarnEnabled()) { + log.warn("Can't stop quartz", e); + } } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java 2014-06-10 08:13:08 UTC (rev 172) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java 2014-06-10 08:14:35 UTC (rev 173) @@ -25,10 +25,12 @@ */ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.google.common.collect.Lists; import java.io.Serializable; import java.util.Collection; +import java.util.UUID; public class FaxToMailSession implements Serializable { @@ -65,19 +67,26 @@ } public String getAuthenticatedUserId() { - return authenticatedUserId; + //return authenticatedUserId; + return UUID.randomUUID().toString(); } public void setAuthenticatedUserId(String authenticatedUserId) { - this.authenticatedUserId = authenticatedUserId; + //this.authenticatedUserId = authenticatedUserId; } public FaxToMailUser getAuthenticatedFaxToMailUser() { - return authenticatedFaxToMailUser; + //return authenticatedFaxToMailUser; + FaxToMailUser result = new FaxToMailUserImpl(); + result.setTopiaId(UUID.randomUUID().toString()); + result.setFirstName("Demo"); + result.setLastName("Demo"); + result.setLogin("demo"); + return result; } public void setAuthenticatedFaxToMailUser(FaxToMailUser authenticatedFaxToMailUser) { - this.authenticatedFaxToMailUser = authenticatedFaxToMailUser; + //this.authenticatedFaxToMailUser = authenticatedFaxToMailUser; } public void logout() { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java 2014-06-10 08:13:08 UTC (rev 172) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java 2014-06-10 08:14:35 UTC (rev 173) @@ -70,7 +70,7 @@ String result = SUCCESS; try { FaxToMailUser user = ldapService.authenticateUser(login, password); - getSession().setAuthenticatedUserId(user.getTopiaId()); + //getSession().setAuthenticatedUserId(user.getTopiaId()); } catch (AuthenticationException ex) { result = ERROR; addActionError("Can't login");

1 0

r172 - trunk
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 10:13:08 +0200 (Tue, 10 Jun 2014) New Revision: 172 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/172 Log: Use release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-10 08:12:51 UTC (rev 171) +++ trunk/pom.xml 2014-06-10 08:13:08 UTC (rev 172) @@ -594,7 +594,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-html5shiv</artifactId> - <version>3.7.2-1-SNAPSHOT</version> + <version>3.7.2-1</version> <scope>runtime</scope> </dependency>

1 0

r171 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 10:12:51 +0200 (Tue, 10 Jun 2014) New Revision: 171 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/171 Log: Disable devMode by default Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-10 06:49:05 UTC (rev 170) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-10 08:12:51 UTC (rev 171) @@ -75,7 +75,7 @@ DEV_MODE( "faxtomail.devMode", "Mode développement, court-circuite l'envoi de mail", - "true", Boolean.class), + "false", Boolean.class), STORAGE_FILE( "faxtomail.storage",

1 0

r170 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: kmorin Date: 2014-06-10 08:49:05 +0200 (Tue, 10 Jun 2014) New Revision: 170 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/170 Log: correction r?\195?\169ception des mails Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-10 06:00:32 UTC (rev 169) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-10 06:49:05 UTC (rev 170) @@ -30,6 +30,7 @@ import java.io.FileOutputStream; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -202,9 +203,9 @@ String recipient = address.toString(); MailFolder mailFolder = serviceContext.newService(MailFolderService.class).getFolderForRecipient(recipient); - log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); + if (mailFolder != null) { + log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); - if (mailFolder != null) { email.setRecipient(recipient); email.setMailFolder(mailFolder); modifiedProperties.add(Email.PROPERTY_RECIPIENT); @@ -213,7 +214,7 @@ } } if (email.getMailFolder() == null) { - break; + continue; } emailService.saveEmail(email, null); @@ -225,10 +226,20 @@ Client client = serviceContext.newService(ClientService.class) .getClientForEmailAddress(sender, email.getMailFolder()); - //TODO kmorin 20140602 find the responsible's folder -// if (client != null) { + + if (client != null) { + String object = client.getCaracteristic1() + " / " + + client.getCode() + " / " + + client.getName() + " / " + + client.getFaxNumber() + " / " + + DateFormat.getDateInstance(DateFormat.MEDIUM).format(new Date()); + email.setObject(object); + modifiedProperties.add(Email.PROPERTY_OBJECT); + modifiedProperties.add(Email.PROPERTY_CLIENT); + + //TODO kmorin 20140602 find the responsible's folder // client.getCustomerResponsible() -// } + } email.setClient(client); }

1 0

r169 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin
by kmorin＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: kmorin Date: 2014-06-10 08:00:32 +0200 (Tue, 10 Jun 2014) New Revision: 169 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/169 Log: - 2 m?\195?\169thodes pour r?\195?\169cup?\195?\169rer les compts mail avec ou sans mot de passe - ajout du message ?\195?\160 envoyer en cas de rejet d'un mail (?\195?\160 ajouter dans l'ui) Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-09 21:04:09 UTC (rev 168) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-10 06:00:32 UTC (rev 169) @@ -142,10 +142,8 @@ * * @return all email account */ - public List<EmailAccount> getEmailAccounts() { - EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); - List<EmailAccount> accounts = emailAccountTopiaDao.findAll(); - + public List<EmailAccount> getEmailAccountsWithoutPasswords() { + List<EmailAccount> accounts = getEmailAccounts(); // remove password information from bean final Binder<EmailAccount, EmailAccount> binderEmailAccount = BinderFactory.newBinder(EmailAccount.class); List<EmailAccount> result = Lists.transform(accounts, new Function<EmailAccount, EmailAccount>() { @@ -156,10 +154,16 @@ return account; } }); - + return result; } + public List<EmailAccount> getEmailAccounts() { + EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); + List<EmailAccount> result = emailAccountTopiaDao.findAll(); + return result; + } + /** * * @param newEmailAccounts new email account list to save Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-09 21:04:09 UTC (rev 168) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-10 06:00:32 UTC (rev 169) @@ -106,7 +106,7 @@ demandTypes = referentielService.getAllDemandType(); mailFolders = mailFolderService.getRootMailFolders(); mailFoldersUsage = mailFolderService.getMailFoldersUsage(); - emailAccounts = configurationService.getEmailAccounts(); + emailAccounts = configurationService.getEmailAccountsWithoutPasswords(); mailFilters = configurationService.getMailFilters(); configuration = configurationService.getConfiguration(); users = configurationService.getAllUsers();

1 0

r168 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 23:04:09 +0200 (Mon, 09 Jun 2014) New Revision: 168 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/168 Log: Gestion des droits 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 20:28:16 UTC (rev 167) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 21:04:09 UTC (rev 168) @@ -682,64 +682,87 @@ </tr> </thead> <tbody> - <tr ng-repeat="user in parentScopeValues.writeRightUsers" class="parentInfos"> + <tr ng-repeat="group in parentScopeValues.rightGroups" class="parentInfos"> <td> - <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} + <span class="fa fa-users"></span> {{group.fullPath}} </td> <td> - <label><input type="checkbox" disabled> Lecture</label> - <label><input type="checkbox" disabled> Écriture</label> - <label><input type="checkbox" disabled> Déplacement</label> + <label><input type="checkbox" ng-checked="parentScopeValues.readRightGroups.indexOf(group) != -1" disabled> Lecture</label> + <label><input type="checkbox" ng-checked="parentScopeValues.writeRightGroups.indexOf(group) != -1" disabled> Écriture</label> + <label><input type="checkbox" ng-checked="parentScopeValues.moveRightGroups.indexOf(group) != -1" disabled> Déplacement</label> </td> </tr> - <tr ng-repeat="group in parentScopeValues.writeRightGroups" class="parentInfos"> + <tr ng-repeat="user in parentScopeValues.rightUsers" class="parentInfos"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} </td> <td> - <label><input type="checkbox" disabled> Lecture</label> - <label><input type="checkbox" disabled> Écriture</label> - <label><input type="checkbox" disabled> Déplacement</label> + <label><input type="checkbox" ng-checked="parentScopeValues.readRightUsers.indexOf(user) != -1" disabled> Lecture</label> + <label><input type="checkbox" ng-checked="parentScopeValues.writeRightUsers.indexOf(user) != -1" disabled> Écriture</label> + <label><input type="checkbox" ng-checked="parentScopeValues.moveRightUsers.indexOf(user) != -1" disabled> Déplacement</label> </td> </tr> </tbody> <tbody> - <tr ng-repeat="user in selectedMailFolder.writeRightUsers"> + <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} - <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeWriteRightUser($index)"> + <span class="fa fa-users"></span> {{group.fullPath}} + <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeWriteRightGroup($index)"> <span class="glyphicon glyphicon-remove"></span> </a> </td> <td> - <label><input type="checkbox"> Lecture</label> - <label><input type="checkbox"> Écriture</label> - <label><input type="checkbox"> Déplacement</label> + <label><input type="checkbox" + ng-model="readRightGroup" + ng-checked="selectedMailFolder.readRightGroups.indexOf(group) != -1" + ng-disabled="parentScopeValues.readRightGroups.indexOf(group) != -1" + ng-change="changeReadRightGroup(group)"> Lecture</label> + <label><input type="checkbox" + ng-model="writeRightGroup" + ng-checked="selectedMailFolder.writeRightGroups.indexOf(group) != -1" + ng-disabled="parentScopeValues.writeRightGroups.indexOf(group) != -1" + ng-change="changeWriteRightGroup(group)"> Écriture</label> + <label><input type="checkbox" + ng-model="moveRightGroup" + ng-checked="selectedMailFolder.moveRightGroups.indexOf(group) != -1" + ng-disabled="parentScopeValues.moveRightGroups.indexOf(group) != -1" + ng-change="changeMoveRightGroup(group)"> Déplacement</label> </td> </tr> - <tr ng-repeat="group in selectedMailFolder.writeRightGroups"> + <tr ng-repeat="user in selectedMailFolder.rightUsers"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} - <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeWriteRightGroup($index)"> + <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} + <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeWriteRightUser($index)"> <span class="glyphicon glyphicon-remove"></span> </a> </td> <td> - <label><input type="checkbox"> Lecture</label> - <label><input type="checkbox"> Écriture</label> - <label><input type="checkbox"> Déplacement</label> + <label><input type="checkbox" + ng-model="readRightUser" + ng-checked="selectedMailFolder.readRightUsers.indexOf(user) != -1" + ng-disabled="parentScopeValues.readRightUsers.indexOf(user) != -1" + ng-change="changeReadRightUser(user)"> Lecture</label> + <label><input type="checkbox" + ng-model="writeRightUser" + ng-checked="selectedMailFolder.writeRightUsers.indexOf(user) != -1" + ng-disabled="parentScopeValues.writeRightUsers.indexOf(user) != -1" + ng-change="changeWriteRightUser(user)"> Écriture</label> + <label><input type="checkbox" + ng-model="moveRightUser" + ng-checked="selectedMailFolder.moveRightUsers.indexOf(user) != -1" + ng-disabled="parentScopeValues.moveRightUsers.indexOf(user) != -1" + ng-change="changeMoveRightUser(user)"> Déplacement</label> </td> </tr> </tbody> </table> - <div class="form-inline"> <div class="form-group"> <label for="newRightUserField" class="control-label">Nouveau utilisateur :</label> <select id="newRightUserField" class="form-control" - ng-model="newWriteRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"> + ng-model="newRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"> </select> - <a class="btn btn-success btn-xs" ng-click="addWriteRightUser()" ng-disabled="!newWriteRightUser"> + <a class="btn btn-success btn-xs" ng-click="addRightUser()" ng-disabled="!newRightUser"> <span class="glyphicon glyphicon-plus"></span> </a> </div> @@ -749,9 +772,9 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newWriteRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> </select> - <a class="btn btn-success btn-xs" ng-click="addWriteRightGroup()" ng-disabled="!newWriteRightGroup"> + <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> </a> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 20:28:16 UTC (rev 167) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 21:04:09 UTC (rev 168) @@ -322,6 +322,25 @@ if (!$scope.selectedMailFolder.etatAttentes) { $scope.selectedMailFolder.etatAttentes = []; } + if (!$scope.selectedMailFolder.readRightUsers) { + $scope.selectedMailFolder.readRightUsers = []; + } + if (!$scope.selectedMailFolder.writeRightUsers) { + $scope.selectedMailFolder.writeRightUsers = []; + } + if (!$scope.selectedMailFolder.moveRightUsers) { + $scope.selectedMailFolder.moveRightUsers = []; + } + if (!$scope.selectedMailFolder.readRightGroups) { + $scope.selectedMailFolder.readRightGroups = []; + } + if (!$scope.selectedMailFolder.writeRightGroups) { + $scope.selectedMailFolder.writeRightGroups = []; + } + if (!$scope.selectedMailFolder.moveRightGroups) { + $scope.selectedMailFolder.moveRightGroups = []; + } + // initialise la liste des colonnes pour le dossier courant $scope.folderTableColumns = []; @@ -344,6 +363,40 @@ }); $scope.selectedMailFolder.etatAttentes = newArray; } + + // right + $scope.selectedMailFolder.rightUsers = []; + $scope.selectedMailFolder.rightGroups = []; + angular.forEach($scope.selectedMailFolder.readRightUsers, function(user) { + if ($scope.selectedMailFolder.rightUsers.indexOf(user) == -1) { + $scope.selectedMailFolder.rightUsers.push(user); + } + }); + angular.forEach($scope.selectedMailFolder.writeRightUsers, function(user) { + if ($scope.selectedMailFolder.rightUsers.indexOf(user) == -1) { + $scope.selectedMailFolder.rightUsers.push(user); + } + }); + angular.forEach($scope.selectedMailFolder.moveRightUsers, function(user) { + if ($scope.selectedMailFolder.rightUsers.indexOf(user) == -1) { + $scope.selectedMailFolder.rightUsers.push(user); + } + }); + angular.forEach($scope.selectedMailFolder.readRightGroups, function(group) { + if ($scope.selectedMailFolder.rightGroups.indexOf(group) == -1) { + $scope.selectedMailFolder.rightGroups.push(group); + } + }); + angular.forEach($scope.selectedMailFolder.writeRightGroups, function(group) { + if ($scope.selectedMailFolder.rightGroups.indexOf(group) == -1) { + $scope.selectedMailFolder.rightGroups.push(group); + } + }); + angular.forEach($scope.selectedMailFolder.moveRightGroups, function(group) { + if ($scope.selectedMailFolder.rightGroups.indexOf(group) == -1) { + $scope.selectedMailFolder.rightGroups.push(group); + } + }); }; // on doit faire ca par l'ordre des watch angular et ne pas l'appeler dans le edit @@ -359,7 +412,7 @@ $scope.selectedMailFolder.rejectUnknownSender = $scope.selectedMailFolder.rejectUnknownSender || false; } - // initilaisation des valeurs du parent + // initialisation des valeurs du parent $scope.parentScopeValues = { customerResponsibles: [], replyAddresses: [], @@ -387,6 +440,40 @@ }); }); } + + // parent rigths + $scope.parentScopeValues.rightUsers = []; + $scope.parentScopeValues.rightGroups = []; + angular.forEach($scope.parentScopeValues.readRightUsers, function(user) { + if ($scope.parentScopeValues.rightUsers.indexOf(user) == -1) { + $scope.parentScopeValues.rightUsers.push(user); + } + }); + angular.forEach($scope.parentScopeValues.writeRightUsers, function(user) { + if ($scope.parentScopeValues.rightUsers.indexOf(user) == -1) { + $scope.parentScopeValues.rightUsers.push(user); + } + }); + angular.forEach($scope.parentScopeValues.moveRightUsers, function(user) { + if ($scope.parentScopeValues.rightUsers.indexOf(user) == -1) { + $scope.parentScopeValues.rightUsers.push(user); + } + }); + angular.forEach($scope.parentScopeValues.readRightGroups, function(group) { + if ($scope.parentScopeValues.rightGroups.indexOf(group) == -1) { + $scope.parentScopeValues.rightGroups.push(group); + } + }); + angular.forEach($scope.parentScopeValues.writeRightGroups, function(group) { + if ($scope.parentScopeValues.rightGroups.indexOf(group) == -1) { + $scope.parentScopeValues.rightGroups.push(group); + } + }); + angular.forEach($scope.parentScopeValues.moveRightGroups, function(group) { + if ($scope.parentScopeValues.rightGroups.indexOf(group) == -1) { + $scope.parentScopeValues.rightGroups.push(group); + } + }); } }); @@ -622,30 +709,80 @@ }; // add user write right - $scope.addWriteRightUser = function() { - $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUser); + $scope.addRightUser = function() { + $scope.selectedMailFolder.rightUsers.push($scope.newRightUser); delete $scope.newWriteRightUser; }; // remove user write right - $scope.removeWriteRightUser = function(index) { + $scope.removeRightUser = function(index) { if ($window.confirm("Êtes-vous sur de vouloir supprimer les droits de cet utilisateur ?")) { - $scope.selectedMailFolder.writeRightUsers.splice(index, 1); + $scope.selectedMailFolder.rightUsers.splice(index, 1); } }; // add group write right - $scope.addWriteRightGroup = function() { - $scope.selectedMailFolder.writeRightGroups.push($scope.newWriteRightGroup); - delete $scope.newWriteRightGroup; + $scope.addRightGroup = function() { + $scope.selectedMailFolder.rightGroups.push($scope.newRightGroup); + delete $scope.newRightGroup; }; // remove group write right $scope.removeWriteRightGroup = function(index) { if ($window.confirm("Êtes-vous sur de vouloir supprimer les droits de ce groupe ?")) { + $scope.selectedMailFolder.rightGroups.splice(index, 1); + } + }; + + // + $scope.changeReadRightGroup = function(group) { + var index = $scope.selectedMailFolder.readRightGroups.indexOf(group); + if (index != -1) { + $scope.selectedMailFolder.readRightGroups.splice(index, 1); + } else { + $scope.selectedMailFolder.readRightGroups.push(group); + } + }; + $scope.changeWriteRightGroup = function(group) { + var index = $scope.selectedMailFolder.writeRightGroups.indexOf(group); + if (index != -1) { $scope.selectedMailFolder.writeRightGroups.splice(index, 1); + } else { + $scope.selectedMailFolder.writeRightGroups.push(group); } }; + $scope.changeMoveRightGroup = function(group) { + var index = $scope.selectedMailFolder.moveRightGroups.indexOf(group); + if (index != -1) { + $scope.selectedMailFolder.moveRightGroups.splice(index, 1); + } else { + $scope.selectedMailFolder.moveRightGroups.push(group); + } + }; + $scope.changeReadRightUser = function(user) { + var index = $scope.selectedMailFolder.readRightUsers.indexOf(user); + if (index != -1) { + $scope.selectedMailFolder.readRightUsers.splice(index, 1); + } else { + $scope.selectedMailFolder.readRightUsers.push(user); + } + }; + $scope.changeWriteRightUser = function(user) { + var index = $scope.selectedMailFolder.writeRightUsers.indexOf(user); + if (index != -1) { + $scope.selectedMailFolder.writeRightUsers.splice(index, 1); + } else { + $scope.selectedMailFolder.writeRightUsers.push(user); + } + }; + $scope.changeMoveRightUser = function(user) { + var index = $scope.selectedMailFolder.moveRightUsers.indexOf(user); + if (index != -1) { + $scope.selectedMailFolder.moveRightUsers.splice(index, 1); + } else { + $scope.selectedMailFolder.moveRightUsers.push(user); + } + }; }]);

1 0

r167 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 22:28:16 +0200 (Mon, 09 Jun 2014) New Revision: 167 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/167 Log: COnfiguration des colonnes ?\195?\160 afficher et des actions possibles 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 20:00:27 UTC (rev 166) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 20:28:16 UTC (rev 167) @@ -576,9 +576,23 @@ </div> <div id="collapse5" class="panel-collapse collapse"> <div class="panel-body"> - <label class="checkbox" ng-repeat="(folderAction,label) in folderActions"> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelFolderActions" + ng-value="false" ng-change="initFolderActions()" /> + Hériter des actions contextuelles déclarées sur les dossiers parent : + </label> + <label class="checkbox" ng-repeat="(folderAction,label) in folderActions" ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelFolderActions"> + <input type="checkbox" ng-checked="parentScopeValues.folderActions.indexOf(folderAction) != -1" + disabled> {{label}} + </label> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelFolderActions" ng-value="true" + ng-change="initFolderActions()" ng-if="selectedMailFolder.$parent" /> + Définir les actions contextuelles possibles pour ce dossier : + </label> + <label class="checkbox" ng-repeat="(folderAction,label) in folderActions" ng-if="selectedMailFolder.useCurrentLevelFolderActions || !selectedMailFolder.$parent"> <input type="checkbox" ng-checked="selectedMailFolder.folderActions.indexOf(folderAction) != -1" - ng-click="changeFolderAction(folderAction)"> {{label}} + ng-click="changeFolderAction(folderAction)"> {{label}} </label> </div> </div> @@ -596,26 +610,50 @@ <div id="collapse6" class="panel-collapse collapse"> <div class="panel-body"> - <label> - <input type="checkbox" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" /> Définir un ordre - différent du dossier parent à ce niveau.</label> - <hr /> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" + ng-value="false" ng-change="initFolderColumns()" /> + Hériter des colonnes déclarées sur les dossiers parent : + </label> - <div class="control-group"> - <label class="control-label" for="tableColumns">Champs à afficher dans le tableau (l'ordre peut être changé en faisant un glisser/déposer sur les champs)</label> - + <div class="control-group" ng-show="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="parentFolderTableColumns" + simple-query="getObjectsData" multiple sortable disabled> + </div> + </div> + + <div ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="mailField in parentFolderTableColumns">{{mailFields[mailField.id]}}</th> + </tr> + </thead> + </table> + </div> + + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" + ng-change="initFolderColumns()" ng-if="selectedMailFolder.$parent" /> + Définir les colonnes à afficher pour ce dossier : + </label> + + <div class="control-group" ng-show="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> + <div class="controls"> <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" - simple-query="getObjectsData" multiple sortable ng-disabled="!selectedMailFolder.useCurrentLevelTableColumns"> + simple-query="getObjectsData" multiple sortable> + <p class="help-block">(l'ordre peut être changé en faisant un glisser/déposer sur les champs)</p> </div> </div> - <div> + <div ng-if="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> <table id='table-snapshot' class="table table-bordered"> <caption>Aperçu</caption> <thead> <tr> - <th ng-repeat="etatAttenteField in folderTableColumns">{{mailFields[etatAttenteField.id]}}</th> + <th ng-repeat="mailField in folderTableColumns">{{mailFields[mailField.id]}}</th> </tr> </thead> </table> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 20:00:27 UTC (rev 166) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 20:28:16 UTC (rev 167) @@ -249,6 +249,8 @@ $scope.newReplyDomain; // {Array} Colonnes selectionnées pour le dossier courant $scope.folderTableColumns; + // {Array} Colonnes selectionnées pour les dossiers parents + $scope.parentFolderTableColumns; // {Object} Global parent wide configuration and values $scope.parentScopeValues; @@ -374,6 +376,17 @@ moveRightGroups: [] }; updateParentScopeValues($scope.selectedMailFolder.$parent); + + // init select 2 data for parent + if ($scope.parentScopeValues.folderTableColumns) { + $scope.parentFolderTableColumns = []; + angular.forEach($scope.parentScopeValues.folderTableColumns, function(folderTableColumn) { + $scope.parentFolderTableColumns.push({ + id: folderTableColumn, + label: $scope.mailFields[folderTableColumn] + }); + }); + } } }); @@ -567,6 +580,17 @@ } }; + // initialise la liste des actions possibles avec celle des niveaux supérieurs + $scope.initFolderActions = function() { + if ($scope.selectedMailFolder.useCurrentLevelFolderActions) { + if ($scope.parentScopeValues.folderActions) { + $scope.selectedMailFolder.folderActions = $scope.parentScopeValues.folderActions.slice(); // soft copy + } + } else { + delete $scope.selectedMailFolder.folderActions; + } + }; + // selection/deselection d'une action possible du menu contextuel pour ce dossier $scope.changeFolderAction = function(folderAction) { var index = $scope.selectedMailFolder.folderActions.indexOf(folderAction); @@ -576,7 +600,27 @@ $scope.selectedMailFolder.folderActions.push(folderAction); } }; - + + // initialise la liste des actions possibles avec celle des niveaux supérieurs + $scope.initFolderColumns = function() { + if ($scope.selectedMailFolder.useCurrentLevelTableColumns) { + if ($scope.parentScopeValues.folderActions) { + $scope.selectedMailFolder.folderTableColumns = $scope.parentScopeValues.folderTableColumns.slice(); // soft copy + + // init select2 data + $scope.folderTableColumns = []; + angular.forEach($scope.selectedMailFolder.folderTableColumns, function(folderTableColumn) { + $scope.folderTableColumns.push({ + id: folderTableColumn, + label: $scope.mailFields[folderTableColumn] + }); + }); + } + } else { + delete $scope.selectedMailFolder.folderTableColumns; + } + }; + // add user write right $scope.addWriteRightUser = function() { $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUser);

1 0

r166 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 22:00:27 +0200 (Mon, 09 Jun 2014) New Revision: 166 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/166 Log: Edition des ?\195?\169tats d'attente 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 19:05:15 UTC (rev 165) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 20:00:27 UTC (rev 166) @@ -542,16 +542,23 @@ </div> <div id="collapse3" class="panel-collapse collapse"> <div class="panel-body"> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelEtatAttente" + ng-value="false" ng-change="initFolderEtatAttente()" /> + Hériter des états d'attente déclarés sur les dossiers parent : + </label> + <label class="checkbox" ng-repeat="etatAttente in etatAttentes" ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelEtatAttente"> + <input type="checkbox" ng-checked="parentScopeValues.etatAttentes.indexOf(etatAttente) != -1" + disabled> {{etatAttente.label}} + </label> <label> - <input type="checkbox" ng-model="selectedMailFolder.useCurrentLevelEtatAttente" ng-value="true" /> - Redéfinir les états d'attente à ce niveau. + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelEtatAttente" ng-value="true" + ng-change="initFolderEtatAttente()" ng-if="selectedMailFolder.$parent" /> + Définir des états d'attente pour ce dossier : </label> - Dans le cas contraires, les états d'attentes des dossiers parents seront pris en compte. - <hr /> - <label class="checkbox" ng-repeat="etatAttente in etatAttentes"> - <input type="checkbox" ng-checked="selectedMailFolder.etatAttente.indexOf(etatAttente) != -1" - ng-click="changeFolderEtatAttente(etatAttente)" - ng-disabled="!selectedMailFolder.useCurrentLevelEtatAttente"> {{etatAttente.label}} + <label class="checkbox" ng-repeat="etatAttente in etatAttentes" ng-if="selectedMailFolder.useCurrentLevelEtatAttente || !selectedMailFolder.$parent"> + <input type="checkbox" ng-checked="selectedMailFolder.etatAttentes.indexOf(etatAttente) != -1" + ng-click="changeFolderEtatAttente(etatAttente)"> {{etatAttente.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-09 19:05:15 UTC (rev 165) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 20:00:27 UTC (rev 166) @@ -317,8 +317,8 @@ if (!$scope.selectedMailFolder.folderTableColumns) { $scope.selectedMailFolder.folderTableColumns = []; } - if (!$scope.selectedMailFolder.etatAttente) { - $scope.selectedMailFolder.etatAttente = []; + if (!$scope.selectedMailFolder.etatAttentes) { + $scope.selectedMailFolder.etatAttentes = []; } // initialise la liste des colonnes pour le dossier courant @@ -329,6 +329,19 @@ label: $scope.mailFields[folderTableColumn] }); }); + + // change instance (for indexOf() to work) + if ($scope.selectedMailFolder.etatAttentes) { + var newArray = []; + angular.forEach($scope.selectedMailFolder.etatAttentes, function(folderEtatAttente) { + angular.forEach($scope.etatAttentes, function(etatAttente) { + if (etatAttente.topiaId == folderEtatAttente.topiaId) { + newArray.push(etatAttente); + } + }); + }); + $scope.selectedMailFolder.etatAttentes = newArray; + } }; // on doit faire ca par l'ordre des watch angular et ne pas l'appeler dans le edit @@ -351,7 +364,7 @@ replyDomains: [], folderActions: [], folderTableColumns: [], - etatAttente: [], + etatAttentes: [], //rigths readRightUsers: [], readRightGroups: [], @@ -388,14 +401,14 @@ if (!$scope.parentScopeValues.ediFolder) { $scope.parentScopeValues.ediFolder = folder.ediFolder; } - if (!$scope.parentScopeValues.folderActions) { + if ((!$scope.parentScopeValues.folderActions || $scope.parentScopeValues.folderActions.length == 0) && folder.folderActions) { $scope.parentScopeValues.folderActions = folder.folderActions; } - if (!$scope.parentScopeValues.folderTableColumns) { + if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; } - if (!$scope.parentScopeValues.etatAttente) { - $scope.parentScopeValues.etatAttente = folder.etatAttente; + if ((!$scope.parentScopeValues.etatAttentes || $scope.parentScopeValues.etatAttentes.length == 0) && folder.etatAttentes) { + $scope.parentScopeValues.etatAttentes = folder.etatAttentes; } // move to parent first to keed parent order for collection @@ -533,13 +546,24 @@ } }; + // initialise la liste des etats d'attente avec celle des niveaux supérieurs + $scope.initFolderEtatAttente = function() { + if ($scope.selectedMailFolder.useCurrentLevelEtatAttente) { + if ($scope.parentScopeValues.etatAttentes) { + $scope.selectedMailFolder.etatAttentes = $scope.parentScopeValues.etatAttentes.slice(); // soft copy + } + } else { + delete $scope.selectedMailFolder.etatAttentes; + } + }; + // selection/deselection d'un état d'attente possible pour ce dossier $scope.changeFolderEtatAttente = function(etatAttente) { - var index = $scope.selectedMailFolder.etatAttente.indexOf(etatAttente); + var index = $scope.selectedMailFolder.etatAttentes.indexOf(etatAttente); if (index != -1) { - $scope.selectedMailFolder.etatAttente.splice(index, 1); + $scope.selectedMailFolder.etatAttentes.splice(index, 1); } else { - $scope.selectedMailFolder.etatAttente.push(etatAttente); + $scope.selectedMailFolder.etatAttentes.push(etatAttente); } };

1 0

r165 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 21:05:15 +0200 (Mon, 09 Jun 2014) New Revision: 165 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/165 Log: Configuration des valeurs parentes/non parente dossier edi/domain fax Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 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-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-06-09 17:25:26 UTC (rev 164) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-06-09 19:05:15 UTC (rev 165) @@ -82,7 +82,7 @@ } public boolean isAuthenticated() { - return session.getAuthenticatedUserId() != null; + return session.getAuthenticatedFaxToMailUser() != null; } public FaxToMailUser getAuthenticatedUser() { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 2014-06-09 17:25:26 UTC (rev 164) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 2014-06-09 19:05:15 UTC (rev 165) @@ -1,7 +1,5 @@ package com.franciaflex.faxtomail.web; -import org.apache.commons.lang3.StringUtils; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; @@ -27,7 +25,7 @@ public String intercept(ActionInvocation invocation) throws Exception { ActionContext context = invocation.getInvocationContext(); FaxToMailSession session = (FaxToMailSession) context.getSession().get(FaxToMailSession.SESSION_PARAMETER); - if (session == null || StringUtils.isBlank(session.getAuthenticatedUserId())) { + if (session == null || session.getAuthenticatedFaxToMailUser() == null) { return "redirect-to-login"; } else { return invocation.invoke(); 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:25:26 UTC (rev 164) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 19:05:15 UTC (rev 165) @@ -332,21 +332,39 @@ ({{parentScopeValues.rejectUnknownSender ? 'Oui' : 'Non'}}) </label> </div> - + + <hr /> + + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelEdiFolder" ng-value="false" /> + Hériter du dossier de dépôt des demandes EDI sur le serveur :</label> + <input type="text" class="form-control" disabled + ng-model="parentScopeValues.ediFolder" ng-if="!selectedMailFolder.useCurrentLevelEdiFolder" /> + </div> <div class="form-group"> - <label for="ediFolderField">Dossier de dépôt des demandes EDI sur le serveur</label> - <div class="input-group"> - <input type="text" class="form-control" id="ediFolderField" ng-model="selectedMailFolder.ediFolder"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelEdiFolder" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir le dossier de dépôt des demandes EDI sur le serveur :</label> + <div class="input-group" ng-if="selectedMailFolder.useCurrentLevelEdiFolder || !selectedMailFolder.$parent"> + <input type="text" class="form-control" ng-model="selectedMailFolder.ediFolder"> <span class="input-group-addon btn btn-info" ng-disabled="selectedMailFolder.ediFolder" tooltip="Fonctionnalité à venir"> <i class="fa fa-cogs"></i> Test </span> </div> </div> - + + <hr /> + + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelFaxDomain" ng-value="false" /> + Hériter du domaine des fax :</label> + <input type="text" class="form-control" disabled + ng-model="parentScopeValues.faxDomain" ng-if="!selectedMailFolder.useCurrentLevelFaxDomain"> + </div> <div class="form-group"> - <label for="faxDomainField">Domaine des fax</label> - <input type="text" class="form-control" id="faxDomainField" ng-model="selectedMailFolder.faxDomain"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelFaxDomain" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir le domaine des fax :</label> + <input type="text" class="form-control" ng-model="selectedMailFolder.faxDomain" ng-if="selectedMailFolder.useCurrentLevelFaxDomain || !selectedMailFolder.$parent"> </div> </div> </div> @@ -827,11 +845,11 @@ </div> <div class="form-group col-xs-2"> <br /> - <button type="button" class="btn btn-info" ng-disabled="!newAccount.host || !newAccount.port || addEmailAccountForm.$invalid" + <button type="button" class="btn btn-info" ng-disabled="!newAccount.protocol || !newAccount.host || !newAccount.port || !newAccount.login || addEmailAccountForm.$invalid" tooltip="Fonctionnalité à venir"> <i class="fa fa-cogs"></i> Test </button> - <button type="button" class="btn btn-success" ng-disabled="!newAccount.host || !newAccount.port || addEmailAccountForm.$invalid" ng-click="addEmailAccount()"> + <button type="button" class="btn btn-success" ng-disabled="!newAccount.protocol || !newAccount.host || !newAccount.port || !newAccount.login || addEmailAccountForm.$invalid" ng-click="addEmailAccount()"> <i class="fa fa-plus"></i> Ajouter </button> </div> 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:25:26 UTC (rev 164) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 19:05:15 UTC (rev 165) @@ -382,19 +382,19 @@ if (angular.isUndefined($scope.parentScopeValues.rejectUnknownSender)) { $scope.parentScopeValues.rejectUnknownSender = folder.rejectUnknownSender; } - if ($scope.parentScopeValues.faxDomain) { + if (!$scope.parentScopeValues.faxDomain) { $scope.parentScopeValues.faxDomain = folder.faxDomain; } - if ($scope.parentScopeValues.ediFolder) { + if (!$scope.parentScopeValues.ediFolder) { $scope.parentScopeValues.ediFolder = folder.ediFolder; } - if ($scope.parentScopeValues.folderActions) { + if (!$scope.parentScopeValues.folderActions) { $scope.parentScopeValues.folderActions = folder.folderActions; } - if ($scope.parentScopeValues.folderTableColumns) { + if (!$scope.parentScopeValues.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; } - if ($scope.parentScopeValues.etatAttente) { + if (!$scope.parentScopeValues.etatAttente) { $scope.parentScopeValues.etatAttente = folder.etatAttente; }

1 0