r483 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin - Faxtomail-commits

6 Aug 2014

Author: echatellier
Date: 2014-08-06 17:59:43 +0200 (Wed, 06 Aug 2014)
New Revision: 483

Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/483

Log:
refs #5538: Indiquer pour chaque compte email si c'est une boite mail ou r?\195?\169ception fax.

Modified:
   trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties
   trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.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

Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties
===================================================================

--- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties	2014-08-06 15:28:53 UTC (rev 482)
+++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties	2014-08-06 15:59:43 UTC (rev 483)
@@ -84,18 +84,6 @@
 # Email
 com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.notNull=true
 com.franciaflex.faxtomail.persistence.entities.Email.attribute.originalEmail.tagvalue.notNull=true
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.rangeRow.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.attachment.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.history.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.client.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.demandType.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.demandStatus.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.priority.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.etatAttente.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.emailGroup.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.replies.tagvalue.lazy=false
-#com.franciaflex.faxtomail.persistence.entities.Email.attribute.takenBy.tagvalue.lazy=false
 
 # History
 com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true

Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java	2014-08-06 15:28:53 UTC (rev 482)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java	2014-08-06 15:59:43 UTC (rev 483)
@@ -34,19 +34,13 @@
 import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext;
 import com.franciaflex.faxtomail.services.service.ClientService;
 import com.franciaflex.faxtomail.services.service.ConfigurationService;
-import com.franciaflex.faxtomail.services.service.ConfigurationServiceImpl;
 import com.franciaflex.faxtomail.services.service.EmailService;
-import com.franciaflex.faxtomail.services.service.EmailServiceImpl;
 import com.franciaflex.faxtomail.services.service.InitFaxToMailService;
 import com.franciaflex.faxtomail.services.service.LdapServiceImpl;
 import com.franciaflex.faxtomail.services.service.MailFolderService;
-import com.franciaflex.faxtomail.services.service.MailFolderServiceImpl;
 import com.franciaflex.faxtomail.services.service.ReferentielService;
-import com.franciaflex.faxtomail.services.service.ReferentielServiceImpl;
 import com.franciaflex.faxtomail.services.service.UserService;
-import com.franciaflex.faxtomail.services.service.UserServiceImpl;
 import com.franciaflex.faxtomail.services.service.ValidationService;
-import com.franciaflex.faxtomail.services.service.ValidationServiceImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -79,6 +73,10 @@
     public static FaxToMailServiceContext newDirectServiceContext(FaxToMailTopiaApplicationContext applicationContext) {
         return new FaxToMailServiceContext(applicationContext, new FaxToMailDefaultServiceFactory());
     }
+    
+    public static FaxToMailServiceContext newDirectServiceContext(FaxToMailTopiaPersistenceContext persistenceContext) {
+        return new FaxToMailServiceContext(persistenceContext, new FaxToMailDefaultServiceFactory());
+    }
 
     private FaxToMailServiceContext(FaxToMailTopiaApplicationContext topiaApplicationContext, FaxToMailServiceFactory serviceFactory) {
         Preconditions.checkNotNull(topiaApplicationContext, "Cannot create an ServiceContext without an ApplicationContext");
@@ -88,6 +86,12 @@
         this.serviceFactory.setServiceContext(this);
     }
 
+    private FaxToMailServiceContext(FaxToMailTopiaPersistenceContext persistenceContext, FaxToMailServiceFactory serviceFactory) {
+        this.persistenceContext = persistenceContext;
+        this.serviceFactory = serviceFactory;
+        this.serviceFactory.setServiceContext(this);
+    }
+
     private FaxToMailServiceContext(FaxToMailServiceContext delegateServiceContext, FaxToMailServiceFactory serviceFactory) {
         this.delegateServiceContext = delegateServiceContext;
         this.serviceFactory = serviceFactory;

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-08-06 15:28:53 UTC (rev 482)
+++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java	2014-08-06 15:59:43 UTC (rev 483)
@@ -26,11 +26,6 @@
 
 import static org.nuiton.i18n.I18n.t;
 
-import com.franciaflex.faxtomail.services.DecoratorServiceImpl;
-import com.franciaflex.faxtomail.services.service.ClientServiceImpl;
-import com.franciaflex.faxtomail.services.service.ConfigurationServiceImpl;
-import com.franciaflex.faxtomail.services.service.EmailServiceImpl;
-import com.franciaflex.faxtomail.services.service.MailFolderServiceImpl;
 import gui.ava.html.Html2Image;
 
 import java.io.ByteArrayOutputStream;
@@ -256,6 +251,7 @@
             for (int i = 0 ; i < count ; i++) {
                 try {
                     Email email = new EmailImpl();
+                    email.setFax(emailAccount.isFaxAccountType());
 
                     int messageNumber = count - i;
                     Message message = folder.getMessage(messageNumber);

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-08-06 15:28:53 UTC (rev 482)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp	2014-08-06 15:59:43 UTC (rev 483)
@@ -1066,8 +1066,8 @@
                 <td>{{emailAccount.port}}</td>
                 <td>{{emailAccount.login}}</td>
                 <td>
-                  <span class="fa fa-fax" tooltip="Compte email ne recevant que des fax" ng-if="emailAccount.faxAccountType"></span>
-                  <span class="fa fa-reply" tooltip="Le rejet des email est autorisé" ng-if="emailAccount.rejectAllowed"></span>
+                  <span class="fa fa-fax" tooltip="Compte email ne recoit que des fax" ng-if="emailAccount.faxAccountType"></span>
+                  <span class="fa fa-reply" tooltip="Le rejet des email est autorisé pour ce compte" ng-if="emailAccount.rejectAllowed"></span>
                 </td>
                 <td>
                   <a class="btn btn-danger btn-xs" ng-click="removeEmailAccount($index)">
@@ -1121,9 +1121,9 @@
                 <div class="form-group col-xs-5">
                   <label class="control-label">Rejet:</label>
                   <div class="checkbox">
-                    <label tooltip="{{newAccount.faxAccountType ? 'Les fax ne peuvent pas être rejeté' : 'Suivant la configuration des filtres de routage, les mails de client inconnus peuvent être rejeté'}}">
+                    <label>
                       <input id="emailRejectAllowed" type="checkbox" ng-value="true"
-                        ng-model="newAccount.rejectAllowed" ng-disabled="newAccount.faxAccountType">
+                        ng-model="newAccount.rejectAllowed">
                       autoriser les mails de ce compte à pouvoir être rejeté
                     </label>
                   </div>

    

r483 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin

echatellier＠users.forge.codelutin.com

tags

participants (1)