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 - Faxtomail-commits

9 Jun 2014

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;
         }

    

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

echatellier＠users.forge.codelutin.com

tags

participants (1)