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

r281 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/WEB-INF/co
by kmorin＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: kmorin Date: 2014-06-27 17:39:42 +0200 (Fri, 27 Jun 2014) New Revision: 281 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/281 Log: - cloture propre de l'appli swing - prise en compte des dossiers affect?\195?\169s ?\195?\160 l'utilisateur - g?\195?\169n?\195?\169ration du contenu du mail en pdf Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.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 Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java 2014-06-27 15:39:42 UTC (rev 281) @@ -0,0 +1,10 @@ +package com.franciaflex.faxtomail.persistence.entities; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public enum NewClientType { + + CREATION, UPDATE, DELETION +} Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-27 15:39:42 UTC (rev 281) @@ -25,9 +25,12 @@ */ import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.persistence.entities.ClientImpl; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.NewClient; +import com.franciaflex.faxtomail.persistence.entities.NewClientTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -38,6 +41,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.Binder; import java.util.ArrayList; import java.util.List; @@ -64,6 +68,7 @@ if (CollectionUtils.isEmpty(clients)) { emailAddress = emailAddress.substring(0, emailAddress.indexOf('@')); + emailAddress.replaceAll(" ", ""); if (NumberUtils.isNumber(emailAddress)) { emailAddress = StringUtils.leftPad(emailAddress, 10, '0'); clients = clientDao.forFaxNumberEquals(emailAddress).findAll(); @@ -104,4 +109,25 @@ } return client; } + + public void updateNewClients() { + NewClientTopiaDao dao = getPersistenceContext().getNewClientDao(); + List<NewClient> newClients = dao.findAll(); + + Binder<NewClient, Client> binder = new Binder<>(); + List<Client> clients = new ArrayList<>(); + for (NewClient newClient : newClients) { + Client client = new ClientImpl(); + binder.copyExcluding(newClient, client, + NewClient.PROPERTY_TOPIA_ID, + NewClient.PROPERTY_TOPIA_CREATE_DATE, + NewClient.PROPERTY_TOPIA_VERSION); + clients.add(client); + } + //TODO kmorin 20140626 update some clients and add others + +// dao.deleteAll(newClients); +// getPersistenceContext().commit(); + } + } 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-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-27 15:39:42 UTC (rev 281) @@ -342,7 +342,7 @@ } filter.setExpression(mailFilter.getExpression().toLowerCase()); - filter.setClientResponsiblePriority(mailFilter.isClientResponsiblePriority()); + filter.setFilterFolderPriority(mailFilter.isFilterFolderPriority()); // mailFilter.getMailFolder().getTopiaId() can start with new_ MailFolder mailFolder = mailFolderCache.get(mailFilter.getMailFolder().getTopiaId()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-27 15:39:42 UTC (rev 281) @@ -326,6 +326,16 @@ firePropertyChanged(PROPERTY_CLIENT_CODE, oldValue, clientCode); } + public boolean isFax() { + return editObject.isFax(); + } + + public void setFax(boolean fax) { + Object oldValue = isFax(); + editObject.setFax(fax); + firePropertyChanged(Email.PROPERTY_FAX, oldValue, fax); + } + public void setClient(Client client) { Object oldValue = getClient(); editObject.setClient(client); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-27 15:39:42 UTC (rev 281) @@ -156,6 +156,7 @@ Color foreground; if (!colorNotAffectedFolders + || context.getCurrentUser().isAffectedFoldersEmpty() || context.getCurrentUser().containsAffectedFolders(node.getMailFolder())) { foreground = Color.BLACK; } else { Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-27 15:39:42 UTC (rev 281) @@ -287,6 +287,12 @@ <groupId>org.webjars</groupId> <artifactId>respond</artifactId> </dependency> + + <dependency> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> + </dependency> + </dependencies> <build> Added: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java (rev 0) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-06-27 15:39:42 UTC (rev 281) @@ -0,0 +1,32 @@ +package com.franciaflex.faxtomail.web.job; + +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.ClientService; +import com.franciaflex.faxtomail.services.service.EmailService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class ClientUpdateJob extends AbstractFaxToMailJob { + + private static final Log log = LogFactory.getLog(ClientUpdateJob.class); + + protected FaxToMailServiceContext serviceContext; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + serviceContext = getServiceContext(jobExecutionContext); + + if (log.isDebugEnabled()) { + log.debug("Running ClientUpdateJob at " + serviceContext.getNow()); + } + + ClientService clientService = serviceContext.newService(ClientService.class); + clientService.updateNewClients(); + } +} 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-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-27 15:39:42 UTC (rev 281) @@ -26,9 +26,17 @@ import static org.nuiton.i18n.I18n.t; +import java.awt.image.RenderedImage; +import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; import java.nio.charset.Charset; import java.text.DateFormat; import java.util.ArrayList; @@ -42,7 +50,6 @@ import javax.activation.DataHandler; import javax.activation.DataSource; import javax.mail.Address; -import javax.mail.BodyPart; import javax.mail.Flags; import javax.mail.Folder; import javax.mail.Message; @@ -58,6 +65,11 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; +import com.itextpdf.text.Document; +import com.itextpdf.text.DocumentException; +import com.itextpdf.text.PageSize; +import com.itextpdf.text.Paragraph; +import com.itextpdf.text.pdf.PdfWriter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; @@ -286,7 +298,20 @@ email.setClient(client); MailFolder mailFolder; - if (filter.isClientResponsiblePriority()) { + if (filter.isFilterFolderPriority()) { + if (client == null && + (filter.getMailFolder().getRejectUnknownSender() != null && + filter.getMailFolder().getRejectUnknownSender())) { + // client unknown filter active + // unknown client -> message rejected + MailFolder folderTmp = filter.getMailFolder(); + emailService.rejectEmail(email.getRecipient(), email.getSender(), email.getObject(), folderTmp.getRejectResponseMessage()); + continue; + } + // to default folder + mailFolder = filter.getMailFolder(); + + } else { // add to person in charge or reject the mail if client is unknown if ( client == null || @@ -309,24 +334,14 @@ FaxToMailUser personInCharge = client.getPersonInCharge(); mailFolder = mailFolderService.getFolderForFaxToMailUser(personInCharge); } - } else { - if(client == null && - (filter.getMailFolder().getRejectUnknownSender() != null && - filter.getMailFolder().getRejectUnknownSender())) { - // client unknown filter active - // unknown client -> message rejected - MailFolder folderTmp = filter.getMailFolder(); - emailService.rejectEmail(email.getRecipient(), email.getSender(), email.getObject(), folderTmp.getRejectResponseMessage()); - continue; - } - // to default folder - mailFolder = filter.getMailFolder(); } - if (mailFolder != null) { - email.setMailFolder(mailFolder); - modifiedProperties.add(Email.PROPERTY_MAIL_FOLDER); + // if no folder found, do not save the mail + if (mailFolder == null) { + continue; } + email.setMailFolder(mailFolder); + modifiedProperties.add(Email.PROPERTY_MAIL_FOLDER); } Date receivedDate = message.getReceivedDate(); @@ -358,6 +373,9 @@ email.setOriginalEmail(emailSource.toString()); List<Attachment> attachements = new ArrayList<>(); + Attachment attachment = convertTextToPdf(emailSource.toString(), email.getObject()); + attachements.add(attachment); + if (message.isMimeType("multipart/*")) { decomposeMultipartEmail(attachements, message, email, emailService); // } else { @@ -565,4 +583,35 @@ return attachment; } + + public Attachment convertTextToPdf(String content, String name) throws IOException, DocumentException { + + File target = File.createTempFile("faxtomail-", ".tmp"); + target.deleteOnExit(); + + Document document = new Document(); + FileOutputStream fos = new FileOutputStream(target); + PdfWriter writer = PdfWriter.getInstance(document, fos); + writer.open(); + + document.setPageSize(PageSize.A4); + document.open(); + + document.add(new Paragraph(content)); + + document.close(); + writer.close(); + + // convert content to blob + EmailService emailService = serviceContext.newService(EmailService.class); + AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); + attachmentFileNew.setFilename(name + ".pdf"); + + Attachment attachment = new AttachmentImpl(); + attachment.setOriginalFile(attachmentFileNew); + attachment.setOriginalFileName(name); + attachment.setAddedByUser(false); + + return attachment; + } } 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-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-27 15:39:42 UTC (rev 281) @@ -899,7 +899,7 @@ <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> <td>{{mailFilter.expression}}</td> <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td>{{mailFilter.clientResponsiblePriority ? 'Oui' : 'Non'}}</td> + <td>{{mailFilter.filterFolderPriority ? 'Oui' : 'Non'}}</td> <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> <span class="glyphicon glyphicon-remove"></span> </a></td> @@ -917,14 +917,14 @@ <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> </div> <div class="form-group"> - <label for="clientResponsiblePriorityField">Utiliser le dossier de la règle en priorité : </label> + <label for="filterFolderPriorityField">Utiliser le dossier de la règle en priorité : </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="false"> non + ng-model="newFilter.filterFolderPriority" ng-value="false"> non </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="true"> oui + ng-model="newFilter.filterFolderPriority" ng-value="true"> oui </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-27 15:23:36 UTC (rev 280) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-27 15:39:42 UTC (rev 281) @@ -936,7 +936,7 @@ ConfigurationModule.controller('ConfigurationFilterController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { //{Object} New accout empty filter - $scope.newFilter = {clientResponsiblePriority:true}; + $scope.newFilter = { filterFolderPriority: false }; // option de la configuration 'sortable' $scope.sortableOptions = { @@ -957,7 +957,7 @@ } $scope.rootFolderMailFilters[rootMailFolder.topiaId].push($scope.newFilter); // clear form - $scope.newFilter = {clientResponsiblePriority:false}; + $scope.newFilter = { filterFolderPriority: false }; }; // remove filter

1 0

r280 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: echatellier Date: 2014-06-27 17:23:36 +0200 (Fri, 27 Jun 2014) New Revision: 280 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/280 Log: Fix tooltip Add doc Fix rigths Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 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-27 15:02:46 UTC (rev 279) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-27 15:23:36 UTC (rev 280) @@ -124,6 +124,7 @@ <div class="form-group"> <label for="openAttachmentCommandField">Ouverture :</label> <input id="openAttachmentCommandField" type="text" class="form-control" ng-model="extensionCommand.openAttachmentCommand" placeholder="" /> + <p class="help-block">Utilisez <code>%f</code> pour representer le fichier en entrée de la commande</p> </div> </td> </tr> @@ -229,12 +230,14 @@ <a class="btn btn-success btn-xs" data-nodrag ng-click="toggle(this)" ng-disabled="!mailFolder.children || mailFolder.children.length == 0"> <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> - <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span></a> + <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}}</a> <a class="pull-right btn btn-info btn-xs" data-nodrag ng-click="newArchiveSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.hasArchiveFolder && !mailFolder.archiveFolder" tooltip="Créer un dossier d'archive"><span class="glyphicon glyphicon-plus"></span></a> - <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder"><span class="glyphicon glyphicon-plus"></span></a> - <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0" - tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes !'|| 'Supprimer ce dossier'}}"> - <span class="glyphicon glyphicon-remove"></span></a> + <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder" tooltip="Créer un sous-dossier"><span class="glyphicon glyphicon-plus"></span></a> + <span class="pull-right" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes et ne peut pas être supprimé !'|| 'Supprimer ce dossier'}}"> + <a class="btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </span> </div> <ol ui-tree-nodes="options" ng-model="mailFolder.children" ng-class="{hidden: !collapsed}"> <li ng-repeat="mailFolder in mailFolder.children" ui-tree-node ng-include="'nodes_renderer.html'"> @@ -718,7 +721,7 @@ <label><input type="checkbox" ng-model="readRightGroup" ng-checked="selectedMailFolder.readRightGroups.containsByTopiaId(group)" - ng-disabled="parentScopeValues.readRightGroups.containsByTopiaId(group)" + ng-disabled="parentScopeValues.readRightGroups.containsByTopiaId(group) || selectedMailFolder.writeRightGroups.containsByTopiaId(user)" ng-change="changeReadRightGroup(group)"> Lecture</label> <label><input type="checkbox" ng-model="writeRightGroup"

1 0

r279 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by dcosse＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: dcosse Date: 2014-06-27 17:02:46 +0200 (Fri, 27 Jun 2014) New Revision: 279 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/279 Log: rejet des mails dont le client n'est pas connu, correction sur l'arborescence des dossiers Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.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-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-27 14:50:53 UTC (rev 278) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-27 15:02:46 UTC (rev 279) @@ -650,4 +650,28 @@ getPersistenceContext().commit(); } + + public void rejectEmail(String from, String to, String subject, + String content) throws EmailException, MessagingException, IOException { + + final String smtpUser = getApplicationConfig().getSmtpUser(); + final String password = getApplicationConfig().getSmtpPassword(); + final boolean useSsl = getApplicationConfig().isSmtpUseSsl(); + + MultiPartEmail message = new MultiPartEmail(); + message.setHostName(getApplicationConfig().getSmtpHost()); + message.setSmtpPort(getApplicationConfig().getSmtpPort()); + if (StringUtils.isNotBlank(smtpUser) && password != null) { + message.setAuthenticator(new DefaultAuthenticator(smtpUser, password)); + } + message.setSSLOnConnect(useSsl); + + message.setCharset(EmailConstants.UTF_8); + message.setFrom(from); + message.addTo(to); + message.setSubject(subject); + message.setMsg(content); + + message.send(); + } } 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-27 14:50:53 UTC (rev 278) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-06-27 15:02:46 UTC (rev 279) @@ -26,6 +26,7 @@ import java.util.Map; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserAbstract; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; @@ -59,6 +60,30 @@ public static final String NEXT = "next"; + protected static final Multimap<Class<?>, String> GSON_EXCLUSIONS = HashMultimap.create(); + + static { + // Fill exclusion map + GSON_EXCLUSIONS.put(FaxToMailUserAbstract.class, FaxToMailUser.PROPERTY_AFFECTED_FOLDERS); + GSON_EXCLUSIONS.put(MailFolderAbstract.class, MailFolder.PROPERTY_PARENT); + } + + protected static final ExclusionStrategy EXCLUSION_STRATEGY = new ExclusionStrategy() { + @Override + public boolean shouldSkipField(FieldAttributes f) { + // TODO AThimel 06/08/13 Maybe another Multimap implementation will do the job ? + Class<?> declaringClass = f.getDeclaringClass(); + String attributeName = f.getName(); + boolean result = GSON_EXCLUSIONS.containsEntry(declaringClass, attributeName); + return result; + } + + @Override + public boolean shouldSkipClass(Class<?> clazz) { + return false; + } + }; + protected FaxToMailConfiguration applicationConfig; protected FaxToMailSession session; @@ -106,25 +131,8 @@ public static Gson getGson() { if (gson == null) { GsonBuilder builder = new GsonBuilder(); - // exclusion - final Multimap<Class<?>, String> gsonExclusions = HashMultimap.create(); - gsonExclusions.put(MailFolderAbstract.class, MailFolder.PROPERTY_PARENT); - builder.addSerializationExclusionStrategy(new ExclusionStrategy() { - @Override - public boolean shouldSkipField(FieldAttributes f) { - // TODO AThimel 06/08/13 Maybe another Multimap implementation will do the job ? - Class<?> declaringClass = f.getDeclaringClass(); - String attributeName = f.getName(); - boolean result = gsonExclusions.containsEntry(declaringClass, attributeName); - return result; - } - - @Override - public boolean shouldSkipClass(Class<?> clazz) { - return false; - } - }); + builder.addSerializationExclusionStrategy(EXCLUSION_STRATEGY); // Renseigne a gson comment instancier les Impl à partir des interfaces Topia FaxToMailEntityEnum[] classes = FaxToMailEntityEnum.getContracts(); 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-27 14:50:53 UTC (rev 278) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-27 15:02:46 UTC (rev 279) @@ -285,19 +285,41 @@ } email.setClient(client); - MailFolder mailFolder = null; + MailFolder mailFolder; if (filter.isClientResponsiblePriority()) { + // add to person in charge or reject the mail if client is unknown if ( client == null || client.getPersonInCharge() == null || client.getPersonInCharge().getAffectedFolders() == null || client.getPersonInCharge().getAffectedFolders().isEmpty()) { + if(client == null && + (filter.getMailFolder().getRejectUnknownSender() != null && + filter.getMailFolder().getRejectUnknownSender())) { + // rejected client mail unknown filter activated + // mail rejected + MailFolder folderTmp = filter.getMailFolder(); + emailService.rejectEmail(email.getRecipient(), email.getSender(), email.getObject(), folderTmp.getRejectResponseMessage()); + continue; + } + // client mailFolder unknown -> to default folder mailFolder = filter.getMailFolder(); } else { + // to client mailFolder FaxToMailUser personInCharge = client.getPersonInCharge(); mailFolder = mailFolderService.getFolderForFaxToMailUser(personInCharge); } } else { + if(client == null && + (filter.getMailFolder().getRejectUnknownSender() != null && + filter.getMailFolder().getRejectUnknownSender())) { + // client unknown filter active + // unknown client -> message rejected + MailFolder folderTmp = filter.getMailFolder(); + emailService.rejectEmail(email.getRecipient(), email.getSender(), email.getObject(), folderTmp.getRejectResponseMessage()); + continue; + } + // to default folder mailFolder = filter.getMailFolder(); } if (mailFolder != null) { 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-27 14:50:53 UTC (rev 278) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-27 15:02:46 UTC (rev 279) @@ -896,7 +896,7 @@ <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> <td>{{mailFilter.expression}}</td> <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td>{{mailFilter.clientResponsiblePriority ? 'Non' : 'Oui'}}</td> + <td>{{mailFilter.clientResponsiblePriority ? 'Oui' : 'Non'}}</td> <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> <span class="glyphicon glyphicon-remove"></span> </a></td> @@ -917,11 +917,11 @@ <label for="clientResponsiblePriorityField">Utiliser le dossier de la règle en priorité : </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="false"> oui + ng-model="newFilter.clientResponsiblePriority" ng-value="false"> non </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="true"> non + ng-model="newFilter.clientResponsiblePriority" ng-value="true"> oui </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-27 14:50:53 UTC (rev 278) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-27 15:02:46 UTC (rev 279) @@ -936,7 +936,7 @@ ConfigurationModule.controller('ConfigurationFilterController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { //{Object} New accout empty filter - $scope.newFilter = {clientResponsiblePriority:false}; + $scope.newFilter = {clientResponsiblePriority:true}; // option de la configuration 'sortable' $scope.sortableOptions = {

1 0

r278 - in trunk: . faxtomail-persistence/src/main/xmi faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: echatellier Date: 2014-06-27 16:50:53 +0200 (Fri, 27 Jun 2014) New Revision: 278 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/278 Log: Fix database attachment Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-27 14:22:11 UTC (rev 277) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-27 14:50:53 UTC (rev 278) @@ -24,7 +24,6 @@ model.tagValue.notGenerateToString=true model.tagValue.constantPrefix=PROPERTY_ model.tagValue.hibernateAttributeType.java.lang.String=text -model.tagValue.hibernateAttributeType.byte[]=binary model.tagValue.useEnumerationName=true model.tagValue.doNotGenerateBooleanGetMethods=true @@ -60,6 +59,9 @@ # AttachmentFile com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.filename.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true +# il faut mettre une valeur > � 8000 pour que la mapping g�n�re un type varbinary(max) +com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagValue.hibernateAttributeType=binary +com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.length=9999999 # MailFolder com.franciaflex.faxtomail.persistence.entities.MailFolder.class.tagvalue.naturalIdMutable=true Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-06-27 14:22:11 UTC (rev 277) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-06-27 14:50:53 UTC (rev 278) @@ -62,8 +62,7 @@ protected File databaseFile; - protected FaxToMailTopiaApplicationContext newApplicationContext(String dataBase) { - + protected Map<String, String> getDatabaseConfiguration(String dataBase) { Map<String, String> hibernateH2Config = new HashMap<String, String>(); hibernateH2Config.putAll(getApplicationConfig().getTopiaProperties()); @@ -92,7 +91,14 @@ if (log.isDebugEnabled()) { log.debug("jdbc url is\n" + jdbcUrl); } + + return hibernateH2Config; + } + protected FaxToMailTopiaApplicationContext newApplicationContext(String dataBase) { + + Map<String, String> hibernateH2Config = getDatabaseConfiguration(dataBase); + FaxToMailTopiaApplicationContext applicationContext = new FaxToMailTopiaApplicationContext(hibernateH2Config); if (log.isTraceEnabled()) { @@ -241,7 +247,9 @@ } // clear full directory - FileUtils.deleteDirectory(databaseFile); + if (databaseFile != null) { + FileUtils.deleteDirectory(databaseFile); + } } protected static FaxToMailConfiguration getApplicationConfig() { Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java (rev 0) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java 2014-06-27 14:50:53 UTC (rev 278) @@ -0,0 +1,54 @@ +package com.franciaflex.faxtomail.services.service; + +/* + * #%L + * FaxToMail :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.HashMap; +import java.util.Map; + +import org.hibernate.cfg.Environment; +import org.junit.Ignore; +import org.junit.Test; + +@Ignore +public class MiscTest extends AbstractFaxToMailServiceTest { + + @Override + protected Map<String, String> getDatabaseConfiguration(String dataBase) { + Map<String, String> hibernateH2Config = new HashMap<String, String>(); + + hibernateH2Config.put(Environment.DIALECT, "org.hibernate.dialect.SQLServer2008Dialect"); + hibernateH2Config.put(Environment.DRIVER, "net.sourceforge.jtds.jdbc.Driver"); + hibernateH2Config.put(Environment.USER, "fx"); + hibernateH2Config.put(Environment.PASS, "FX2013!"); + hibernateH2Config.put(Environment.HBM2DDL_AUTO, ""); + hibernateH2Config.put(Environment.URL, "jdbc:jtds:sqlserver://192.168.100.247:1433/faxtomailtest"); + return hibernateH2Config; + } + + @Test + public void getSqlServerSchema() { + getApplicationContext().showCreateSchema(); + } +} Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-27 14:22:11 UTC (rev 277) +++ trunk/pom.xml 2014-06-27 14:50:53 UTC (rev 278) @@ -104,8 +104,8 @@ <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion> - <eugeneVersion>2.10</eugeneVersion> - <topiaVersion>3.0-beta-6</topiaVersion> + <eugeneVersion>2.11-SNAPSHOT</eugeneVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version>

1 0

r277 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by kmorin＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: kmorin Date: 2014-06-27 16:22:11 +0200 (Fri, 27 Jun 2014) New Revision: 277 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/277 Log: correction de d?\195?\169tection du droit d'?\195?\169criture Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-06-27 06:58:01 UTC (rev 276) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-06-27 14:22:11 UTC (rev 277) @@ -70,7 +70,7 @@ MailFolder folder = currentEmail.getMailFolder(); boolean canWrite = false; - while (!canWrite && folder.getParent() != null) { + while (!canWrite && folder != null) { canWrite = folder.containsWriteRightUsers(currentUser) || !CollectionUtils.intersection(folder.getWriteRightGroups(), currentUser.getUserGroups()).isEmpty();

1 0

r276 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by echatellier＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: echatellier Date: 2014-06-27 08:58:01 +0200 (Fri, 27 Jun 2014) New Revision: 276 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/276 Log: Fix i18n for windows Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-26 21:26:35 UTC (rev 275) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-27 06:58:01 UTC (rev 276) @@ -54,6 +54,8 @@ import org.jdesktop.swingx.auth.LoginService; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.UserI18nInitializer; import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.ApplicationUIContext; @@ -350,7 +352,13 @@ log.info(String.format("Starts i18n with locale [%s]", i18nLocale)); } - I18n.init(new ClassPathI18nInitializer(), i18nLocale); + try { + // production case + I18n.init(new DefaultI18nInitializer("faxtomail-i18n"), i18nLocale); + } catch (RuntimeException ex) { + // fallback case : strange ide behaviour (eclipse) + I18n.init(new ClassPathI18nInitializer(), i18nLocale); + } // try to autologin user from username of current X session autologinUser();

1 0

r274 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: echatellier Date: 2014-06-26 23:22:45 +0200 (Thu, 26 Jun 2014) New Revision: 274 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/274 Log: erreur de commit ? Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-26 20:48:29 UTC (rev 273) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-26 21:22:45 UTC (rev 274) @@ -144,14 +144,14 @@ faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin -// List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); -// if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { -// for (FaxToMailUserGroup group : user.getUserGroups()) { -// if (adminGroups.contains(group.getFullPath())) { + List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); + if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { + for (FaxToMailUserGroup group : user.getUserGroups()) { + if (adminGroups.contains(group.getCompleteName())) { faxToMailSession.setAdmin(true); -// } -// } -// } + } + } + } } }

2 1

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

26 Jun '14

Author: echatellier Date: 2014-06-26 23:26:35 +0200 (Thu, 26 Jun 2014) New Revision: 275 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/275 Log: Rename fullpath to completename (reserved keyword) Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 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/user-folder-input.jsp 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-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -454,7 +454,7 @@ public List<FaxToMailUserGroup> getAllGroups() { FaxToMailUserGroupTopiaDao faxToMailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_FULL_PATH).findAll(); + return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_COMPLETE_NAME).findAll(); } /** Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -160,13 +160,13 @@ // user groups FaxToMailUserGroupTopiaDao userGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Chargés de clientèle", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Chargés de clientèle"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Chargés de clientèle"); FaxToMailUserGroup commerciauxGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Commerciaux", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Commerciaux"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Commerciaux"); FaxToMailUserGroup savGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "SAV", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/SAV"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/SAV"); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Administrateurs", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Administrateurs"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Administrateurs"); FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUser marc = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Lefèbvre", Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -108,7 +108,7 @@ * @param groupCN * @return */ - protected String getGroupFullPath(String groupCN) { + protected String getGroupCompleteName(String groupCN) { String[] parts = groupCN.split(","); ArrayUtils.reverse(parts); @@ -307,13 +307,13 @@ String[] groups = searchEntry.getAttributeValues("memberOf"); if (ArrayUtils.isNotEmpty(groups)) { for (String group : groups) { - String groupPath = getGroupFullPath(group); + String groupPath = getGroupCompleteName(group); String groupName = StringUtils.substringAfterLast(groupPath, "/"); FaxToMailUserGroup userGroup = faxtomailUserGroupDao.forNameEquals(groupName).findUniqueOrNull(); if (userGroup == null) { userGroup = faxtomailUserGroupDao.create( FaxToMailUserGroup.PROPERTY_NAME, groupName, - FaxToMailUserGroup.PROPERTY_FULL_PATH, groupPath); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, groupPath); } user.addUserGroups(userGroup); } 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-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 21:26:35 UTC (rev 275) @@ -687,7 +687,7 @@ <tbody> <tr ng-repeat="group in parentScopeValues.rightGroups" class="parentInfos"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} </td> <td> <label><input type="checkbox" ng-checked="parentScopeValues.readRightGroups.containsByTopiaId(group)" disabled> Lecture</label> @@ -709,7 +709,7 @@ <tbody> <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -775,7 +775,7 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -809,7 +809,7 @@ <tbody> <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -855,7 +855,7 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -1031,7 +1031,7 @@ <tr ng-repeat="groupChef in configuration.chefs" ng-class="{'info' : groupChef == selectedGroupChef}" ng-click="editGroupChef(groupChef)"> - <td>{{groupChef.userGroup ? groupChef.userGroup.fullPath : '(aucun groupe)'}} + <td>{{groupChef.userGroup ? groupChef.userGroup.completeName : '(aucun groupe)'}} <a class="btn btn-danger btn-xs pull-right" ng-click="removeGroupChef(groupChef, $index)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -1052,7 +1052,7 @@ <label for="groupChefUserGroupField" class="control-label">Chef du groupe : </label> <select id="groupChefUserGroupField" class="form-control" ng-required="selectedGroupChef" ng-model="selectedGroupChef.userGroup" - ng-options="group as group.fullPath for group in groups"> + ng-options="group as group.completeName for group in groups"> <option value="" ng-if="!selectedGroupChef.userGroup"></option> </select> </div> @@ -1069,7 +1069,7 @@ <tr ng-repeat="group in selectedGroupChef.managedGroups"> <td> <span class="fa fa-users"></span> - {{group.fullPath}} + {{group.completeName}} <a class="btn btn-danger btn-xs pull-right" ng-click="removeManagedGroup($index)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -1084,7 +1084,7 @@ <div class="form-group"> <label for="newManagedGroupField" class="control-label">Nouveau groupe :</label> <select id="newManagedGroupField" class="form-control" - ng-model="newManagedGroup" ng-options="group as group.fullPath for group in groups" width="'100%'" searchContains="true"> + ng-model="newManagedGroup" ng-options="group as group.completeName for group in groups" width="'100%'" searchContains="true"> </select> <a class="btn btn-success btn-xs" ng-click="addManagedGroup()" ng-disabled="!newManagedGroup"> <span class="glyphicon glyphicon-plus"></span> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-26 21:26:35 UTC (rev 275) @@ -43,7 +43,7 @@  </head>

1 0

r273 - trunk/faxtomail-ui-swing/src/main/assembly/min
by echatellier＠users.forge.codelutin.com 26 Jun '14

26 Jun '14

Author: echatellier Date: 2014-06-26 22:48:29 +0200 (Thu, 26 Jun 2014) New Revision: 273 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/273 Log: Fix launch script files Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat 2014-06-26 20:36:55 UTC (rev 272) +++ trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat 2014-06-26 20:48:29 UTC (rev 273) @@ -3,7 +3,7 @@ set OLDDIR=%CD% cd /d %~dp0% -%JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=128M -Dfaxtomail.log.file=%FAXTOMAIL_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xmx1024M -XX:MaxPermSize=128M -Dfaxtomail.log.file=%FAXTOMAIL_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 set exitcode=%ERRORLEVEL% echo Stop FaxToMail with exitcode: %exitcode% cd %OLDDIR% Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh 2014-06-26 20:36:55 UTC (rev 272) +++ trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh 2014-06-26 20:48:29 UTC (rev 273) @@ -29,9 +29,7 @@ cd $REP -#echo "java command: $JAVA_COMMAND" - -$JAVA_COMMAND $MEMORY $FAXTOMAIL_JVM_OPTS -Dfaxtomail.log.file=$FAXTOMAIL_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* +java $MEMORY $FAXTOMAIL_JVM_OPTS -Dfaxtomail.log.file=$FAXTOMAIL_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* exitcode=$? echo "Stop FaxToMail with exitcode: $exitcode" exit $exitcode

1 0

r272 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by kmorin＠users.forge.codelutin.com 26 Jun '14

26 Jun '14

Author: kmorin Date: 2014-06-26 22:36:55 +0200 (Thu, 26 Jun 2014) New Revision: 272 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/272 Log: - cloture propre de l'appli swing - prise en compte des dossiers affect?\195?\169s ?\195?\160 l'utilisateur Removed: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Deleted: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-06-26 20:36:55 UTC (rev 272) @@ -1,63 +0,0 @@ -package com.franciaflex.faxtomail.ui.swing.actions; - -/* - * #%L - * FaxToMail :: UI - * %% - * Copyright (C) 2014 Franciaflex - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.franciaflex.faxtomail.ui.swing.RunFaxToMail; -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; - -import static org.nuiton.i18n.I18n.t; - -/** - * To close FaxToMail Application. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 - */ -public class CloseApplicationAction extends AbstractChangeScreenAction { - - protected int exitCode = RunFaxToMail.NORMAL_EXIT_CODE; - - public CloseApplicationAction(MainUIHandler handler) { - super(handler, false, null); - setSkipCheckCurrentScreen(true); - setActionDescription(t("faxtomail.action.exit.tip")); - } - - public void setExitCode(int exitCode) { - this.exitCode = exitCode; - } - - @Override - public void doAction() throws Exception { - - super.doAction(); - - RunFaxToMail.closeFaxToMail(getHandler(), exitCode); - } - - @Override - public void releaseAction() { - exitCode = RunFaxToMail.NORMAL_EXIT_CODE; - super.releaseAction(); - } -} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-26 20:36:55 UTC (rev 272) @@ -29,8 +29,7 @@ #mainFrame { title: "faxtomail.main.title.applicationName"; - defaultCloseOperation: {JFrame.EXIT_ON_CLOSE}; - //iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; + defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; } #menuFile { @@ -59,7 +58,6 @@ actionIcon: exit; text: "faxtomail.main.action.exit"; toolTipText: "faxtomail.main.action.exit.tip"; - _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.CloseApplicationAction.class}; _help: {"faxtomail.main.menu.action.exit.help"}; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-06-26 20:36:55 UTC (rev 272) @@ -52,7 +52,7 @@ <JMenuItem id='menuFileRecherche'/> <JMenuItem id='menuFileConfiguration'/> <JSeparator/> - <JMenuItem id='menuFileExit'/> + <JMenuItem id='menuFileExit' onActionPerformed="this.dispose()"/> </JMenu>  Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-26 20:36:55 UTC (rev 272) @@ -46,6 +46,8 @@ import javax.swing.*; import java.awt.Cursor; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListenerProxy; @@ -131,6 +133,15 @@ initUI(ui); + getUI().addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + if (quitCurrentScreen()) { + RunFaxToMail.closeFaxToMail(MainUIHandler.this, RunFaxToMail.NORMAL_EXIT_CODE); + } + } + }); + // installation layer de blocage en mode busy // SwingUtil.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); // Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-26 20:36:55 UTC (rev 272) @@ -249,7 +249,7 @@ // init tree Map<MailFolder, DefaultMutableTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), ui.getNavigationTree(), model.getFolders()); + FaxToMailUIUtil.initFolderTree(getContext(), ui.getNavigationTree(), model.getFolders(), true); ui.getNavigationTree().addTreeSelectionListener(new TreeSelectionListener() { @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 20:36:55 UTC (rev 272) @@ -74,7 +74,7 @@ JTree navigationTree = ui.getNavigationTree(); Map<MailFolder, DefaultMutableTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, folders); + FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, folders, false); MailFolder currentFolder = getModel().getMailFolder(); for (MailFolder folder : nodesByFolder.keySet()) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-26 20:36:55 UTC (rev 272) @@ -62,6 +62,8 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -101,9 +103,10 @@ setApplicationContext(ui, parentUI.getHandler().getContext()); } - public static Map<MailFolder, DefaultMutableTreeNode> initFolderTree(FaxToMailUIContext context, + public static Map<MailFolder, DefaultMutableTreeNode> initFolderTree(final FaxToMailUIContext context, JTree navigationTree, - Collection<MailFolder> folders) { + Collection<MailFolder> folders, + final boolean colorNotAffectedFolders) { DefaultMutableTreeNode root = new DefaultMutableTreeNode("root"); List<MailFolder> foldersToExpand = context.getExpandedFolders(); @@ -118,7 +121,8 @@ FolderTreeNode parentNode = (FolderTreeNode) nodesByFolder.get(parent); if (parentNode == null) { parentNode = new FolderTreeNode(parent); - parentNode.setCanSelect(false); + parentNode.setCanRead(false); + parentNode.setCanSelect(true); nodesByFolder.put(parent, parentNode); } @@ -142,6 +146,23 @@ FolderTreeNode node = (FolderTreeNode) value; setEnabled(node.isCanSelect()); + Font font = component.getFont(); + if (node.isCanRead()) { + font = font.deriveFont(Font.PLAIN); + } else { + font = font.deriveFont(Font.ITALIC); + } + component.setFont(font); + + Color foreground; + if (!colorNotAffectedFolders + || context.getCurrentUser().containsAffectedFolders(node.getMailFolder())) { + foreground = Color.BLACK; + } else { + foreground = Color.LIGHT_GRAY; + } + component.setForeground(foreground); + return component; } }; @@ -170,11 +191,18 @@ FolderTreeNode node = new FolderTreeNode(folder); node.setCanSelect(true); + node.setCanRead(true); result.put(folder, node); parent.add(node); if (folder.isChildrenNotEmpty()) { List<MailFolder> children = new ArrayList<MailFolder>(folder.getChildren()); + CollectionUtils.filter(children, new Predicate<MailFolder>() { + @Override + public boolean evaluate(MailFolder object) { + return !object.isArchiveFolder(); + } + }); Collections.sort(children, new Comparator<MailFolder>() { @Override public int compare(MailFolder o1, MailFolder o2) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-26 20:36:55 UTC (rev 272) @@ -33,6 +33,7 @@ public class FolderTreeNode extends DefaultMutableTreeNode { protected boolean canSelect; + protected boolean canRead; public FolderTreeNode(MailFolder folder) { super(folder); @@ -50,6 +51,14 @@ this.canSelect = canSelect; } + public boolean isCanRead() { + return canRead; + } + + public void setCanRead(boolean canRead) { + this.canRead = canRead; + } + @Override public String toString() { MailFolder folder = (MailFolder) userObject; 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-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 20:36:55 UTC (rev 272) @@ -888,7 +888,7 @@ <tr> <th>Filtre</th> <th>Dossier</th> - <th>Priorité au chargé de clientelle</th> + <th>Priorité au dossier de la règle</th> <th/> </tr> </thead> @@ -896,7 +896,7 @@ <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> <td>{{mailFilter.expression}}</td> <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td>{{mailFilter.clientResponsiblePriority ? 'Oui' : 'Non'}}</td> + <td>{{mailFilter.clientResponsiblePriority ? 'Non' : 'Oui'}}</td> <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> <span class="glyphicon glyphicon-remove"></span> </a></td> @@ -914,14 +914,14 @@ <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> </div> <div class="form-group"> - <label for="clientResponsiblePriorityField">Utiliser le chargé de clientelle en priorité : </label> + <label for="clientResponsiblePriorityField">Utiliser le dossier de la règle en priorité : </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="true"> oui + ng-model="newFilter.clientResponsiblePriority" ng-value="false"> oui </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="false"> non + ng-model="newFilter.clientResponsiblePriority" ng-value="true"> non </label> </div> </div>

1 0