branch develop updated (78af899 -> dee3815)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 78af899 fixes #9095 new 1a99011 refs #9106 migration des actions inactives de la conf générale à l'arborescence new b13b6b1 refs #9106 modif partie admin des actions inactives de la conf générale à l'arborescence new 2bc31a1 refs #9106 modif partie cliente des actions inactives de la conf générale à l'arborescence new dee3815 Merge branch 'feature/9106_deplacement_parametrage_actions_invalides_dans_arborescence' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dee381539edf7eff5665f16c3264489932e09991 Merge: 78af899 2bc31a1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 16:32:16 2017 +0100 Merge branch 'feature/9106_deplacement_parametrage_actions_invalides_dans_arborescence' into develop commit 2bc31a1f07479e7a44985aa5b01bf9883f7fd32f Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:22:05 2017 +0100 refs #9106 modif partie cliente des actions inactives de la conf générale à l'arborescence commit b13b6b1e44504ca382901c22b72d6dd349552e16 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:21:23 2017 +0100 refs #9106 modif partie admin des actions inactives de la conf générale à l'arborescence commit 1a990115f5bce8d6459706a031a757849ed6ec51 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:21:00 2017 +0100 refs #9106 migration des actions inactives de la conf générale à l'arborescence Summary of changes: .../src/main/xmi/faxtomail.properties | 4 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33882 -> 35274 bytes ..._170314__move_invalidformactions_to_folders.sql | 10 ++++ ..._170314__move_invalidformactions_to_folders.sql | 10 ++++ .../swing/actions/PrintOnDefaultPrinterAction.java | 2 +- .../content/demande/DemandeListUIHandler.java | 2 +- .../swing/content/demande/DemandesUIHandler.java | 10 ++-- .../demande/actions/ArchiveFromListAction.java | 2 +- .../OpenMailFolderChooserFromListAction.java | 2 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++++++++-- .../WEB-INF/content/admin/configuration-input.jsp | 57 ++++++++++++++++----- .../src/main/webapp/js/configuration.js | 43 ++++++++++------ 12 files changed, 126 insertions(+), 43 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 1a990115f5bce8d6459706a031a757849ed6ec51 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:21:00 2017 +0100 refs #9106 migration des actions inactives de la conf générale à l'arborescence --- .../src/main/xmi/faxtomail.properties | 4 ++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33882 -> 35274 bytes ...3_170314__move_invalidformactions_to_folders.sql | 10 ++++++++++ ...3_170314__move_invalidformactions_to_folders.sql | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.properties b/faxtomail-persistence/src/main/xmi/faxtomail.properties index 583da0f..1927ed9 100644 --- a/faxtomail-persistence/src/main/xmi/faxtomail.properties +++ b/faxtomail-persistence/src/main/xmi/faxtomail.properties @@ -58,9 +58,8 @@ com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.host.tagva com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.login.tagvalue.naturalId=true -#�Configuration +# Configuration com.franciaflex.faxtomail.persistence.entities.Configuration.attribute.searchDisplayColumns.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailFieldEnumListUserType -com.franciaflex.faxtomail.persistence.entities.Configuration.attribute.invalidFormDisabledActions.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailActionEnumSetUserType # ExtensionCommand com.franciaflex.faxtomail.persistence.entities.ExtensionCommand.attribute.extension.tagvalue.naturalId=true @@ -83,6 +82,7 @@ com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagva com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.notNull=false com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.name.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.folderTableColumns.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailFieldEnumListUserType +com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.invalidFormDisabledActions.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailActionEnumSetUserType # MailFilter com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.expression.tagvalue.naturalId=true diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 1d9a086..646af6c 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql new file mode 100644 index 0000000..a6f1f7d --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql @@ -0,0 +1,10 @@ +alter table mailfolder add useCurrentLevelInvalidFormDisabledActions boolean; +alter table mailfolder add invalidFormDisabledActions varchar(MAX); + +update mailfolder set useCurrentLevelInvalidFormDisabledActions = 'f'; +update mailfolder +set useCurrentLevelInvalidFormDisabledActions = 't', + invalidFormDisabledActions = (select invalidFormDisabledActions from configuration) +where parent is null; + +alter table configuration drop invalidFormDisabledActions; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql new file mode 100644 index 0000000..9d9555a --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql @@ -0,0 +1,10 @@ +alter table mailfolder add useCurrentLevelInvalidFormDisabledActions bit; +alter table mailfolder add invalidFormDisabledActions varchar(MAX); + +update mailfolder set useCurrentLevelInvalidFormDisabledActions = 0; +update mailfolder +set useCurrentLevelInvalidFormDisabledActions = 1, + invalidFormDisabledActions = (select invalidFormDisabledActions from configuration) +where parent is null; + +alter table configuration drop invalidFormDisabledActions; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit b13b6b1e44504ca382901c22b72d6dd349552e16 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:21:23 2017 +0100 refs #9106 modif partie admin des actions inactives de la conf générale à l'arborescence --- .../WEB-INF/content/admin/configuration-input.jsp | 57 +++++++++++++++++----- .../src/main/webapp/js/configuration.js | 43 ++++++++++------ 2 files changed, 73 insertions(+), 27 deletions(-) diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp index 637a905..a08dc36 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp @@ -98,14 +98,6 @@ <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" fm-integer /> </div> - Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : - <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> - <label> - <input type="checkbox" ng-checked="configuration.invalidFormDisabledActions.indexOf(mailAction) == -1" - ng-click="changeInvalidAction(mailAction)"> {{label}} - </label> - </div> - <table class="table table-bordered"> <caption>Commande de traitement des extensions de pièces jointes</caption> <thead> @@ -1050,17 +1042,58 @@ </div> </div> - <!-- configuration des colonnes a afficher --> + <!-- Sélection des actions possibles pour ce dossier si une demande est invalide --> <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse7"> - Configuration des colonnes à afficher + Sélection des actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> </a> </h4> </div> <div id="collapse7" class="panel-collapse collapse"> <div class="panel-body"> + <div> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelInvalidFormDisabledActions" + ng-value="false" ng-change="initFolderInvalidFormDisabledActions()" /> + Hériter des actions déclarées sur les dossiers parent : + </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions" ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelInvalidFormDisabledActions"> + <label> + <input type="checkbox" ng-checked="parentScopeValues.invalidFormDisabledActions.indexOf(mailAction) == -1" + disabled> {{label}} + </label> + </div> + </div> + <div> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelInvalidFormDisabledActions" ng-value="true" + ng-change="initFolderInvalidFormDisabledActions()" ng-if="selectedMailFolder.$parent" /> + Définir les actions autorisées pour ce dossier : + </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions" ng-if="selectedMailFolder.useCurrentLevelInvalidFormDisabledActions || !selectedMailFolder.$parent"> + <label> + <input type="checkbox" ng-checked="selectedMailFolder.invalidFormDisabledActions.indexOf(mailAction) == -1" + ng-click="changeInvalidAction(mailAction)"> {{label}} + </label> + </div> + </div> + </div> + </div> + </div> + + <!-- configuration des colonnes a afficher --> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse8"> + Configuration des colonnes à afficher + </a> + </h4> + </div> + <div id="collapse8" class="panel-collapse collapse"> + <div class="panel-body"> <label ng-if="selectedMailFolder.$parent"> <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" @@ -1118,12 +1151,12 @@ <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse8"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse9"> Droits </a> </h4> </div> - <div id="collapse8" class="panel-collapse collapse"> + <div id="collapse9" class="panel-collapse collapse"> <div class="panel-body"> <!-- Droits d'accès --> <table id="rights" class="table table-bordered"> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 2d9642f..29e98f6 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -192,21 +192,6 @@ ConfigurationModule.controller('ConfigurationController', ['$scope', 'Configurat ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { - // initialisation de la configuration - if (!$scope.configuration.invalidFormDisabledActions) { - $scope.configuration.invalidFormDisabledActions = []; - } - - // selection/deselection d'une action - $scope.changeInvalidAction = function(action) { - var index = $scope.configuration.invalidFormDisabledActions.indexOf(action); - if (index != -1) { - $scope.configuration.invalidFormDisabledActions.splice(index, 1); - } else { - $scope.configuration.invalidFormDisabledActions.push(action); - } - }; - // Ajout d'une nouvelle ligne vide d'extension $scope.addExtensionRow = function() { if (!$scope.configuration.extensionCommands) { @@ -922,6 +907,13 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if ((!$scope.parentScopeValues.ranges || $scope.parentScopeValues.ranges.length == 0) && folder.ranges) { $scope.parentScopeValues.ranges = folder.ranges; } + console.log($scope.parentScopeValues.invalidFormDisabledActions) + if ($scope.parentScopeValues.invalidFormDisabledActions) + console.log($scope.parentScopeValues.invalidFormDisabledActions.length == 0) + console.log(folder.invalidFormDisabledActions) + if ((!$scope.parentScopeValues.invalidFormDisabledActions || $scope.parentScopeValues.invalidFormDisabledActions.length == 0) && folder.invalidFormDisabledActions) { + $scope.parentScopeValues.invalidFormDisabledActions = folder.invalidFormDisabledActions; + } // move to parent first to keed parent order for collection if (folder.$parent) { @@ -1181,6 +1173,27 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo } }; + // initialise la liste des actions avec celle des niveaux supérieurs + $scope.initFolderInvalidFormDisabledActions = function() { + if ($scope.selectedMailFolder.useCurrentLevelInvalidFormDisabledActions) { + if ($scope.parentScopeValues.invalidFormDisabledActions) { + $scope.selectedMailFolder.invalidFormDisabledActions = $scope.parentScopeValues.invalidFormDisabledActions.slice(); // soft copy + } + } else { + delete $scope.selectedMailFolder.invalidFormDisabledActions; + } + }; + + // selection/deselection d'une action + $scope.changeInvalidAction = function(action) { + var index = $scope.selectedMailFolder.invalidFormDisabledActions.indexOf(action); + if (index != -1) { + $scope.selectedMailFolder.invalidFormDisabledActions.splice(index, 1); + } else { + $scope.selectedMailFolder.invalidFormDisabledActions.push(action); + } + }; + // initialise la liste des colonnes sélectionnées avec celle des niveaux supérieurs $scope.initFolderColumns = function() { if ($scope.selectedMailFolder.useCurrentLevelTableColumns) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2bc31a1f07479e7a44985aa5b01bf9883f7fd32f Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:22:05 2017 +0100 refs #9106 modif partie cliente des actions inactives de la conf générale à l'arborescence --- .../swing/actions/PrintOnDefaultPrinterAction.java | 2 +- .../content/demande/DemandeListUIHandler.java | 2 +- .../swing/content/demande/DemandesUIHandler.java | 10 ++++---- .../demande/actions/ArchiveFromListAction.java | 2 +- .../OpenMailFolderChooserFromListAction.java | 2 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++++++++++++++++++---- 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index 14c7c48..02e83ab 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -96,7 +96,7 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { }); for (DemandeUIModel demandeUIModel : orderedDemands) { - if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT, config)) { + if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT)) { notPrintableDemands.add(demandeUIModel); } else { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 85be89e..6804697 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -701,7 +701,7 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem model.setReplyEnabled(selectedRowCount == 1 && model.getSelectedEmails().get(0).isEditable() - && isActionEnabled(model.getSelectedEmails().get(0), MailAction.REPLY, config)); + && isActionEnabled(model.getSelectedEmails().get(0), MailAction.REPLY)); model.setArchiveEnabled(selectedRowCount > 0); model.setTransmitEnabled(selectedRowCount > 0); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java index fdebab4..e987300 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java @@ -167,19 +167,19 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode boolean editable = model.isEditable(); boolean archived = model.getArchiveDate() != null; - boolean transmitEnabled = editable && isActionEnabled(model, MailAction.TRANSMIT, config); + boolean transmitEnabled = editable && isActionEnabled(model, MailAction.TRANSMIT); getModel().setTransmitEnabled(transmitEnabled); - boolean archiveEnabled = editable && isActionEnabled(model, MailAction.ARCHIVE, config); + boolean archiveEnabled = editable && isActionEnabled(model, MailAction.ARCHIVE); getModel().setArchiveEnabled(archiveEnabled); - boolean groupEnabled = isActionEnabled(model, MailAction.GROUP, config); + boolean groupEnabled = isActionEnabled(model, MailAction.GROUP); getModel().setGroupEnabled(groupEnabled); - boolean printEnabled = isActionEnabled(model, MailAction.PRINT, config); + boolean printEnabled = isActionEnabled(model, MailAction.PRINT); getModel().setPrintEnabled(printEnabled); - boolean replyEnabled = (editable || archived) && isActionEnabled(model, MailAction.REPLY, config); + boolean replyEnabled = (editable || archived) && isActionEnabled(model, MailAction.REPLY); getModel().setReplyEnabled(replyEnabled); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java index 0bc0695..f52f524 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java @@ -65,7 +65,7 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { for (DemandeUIModel demandeUIModel : currentEmails) { // is the demand archivable? if (!demandeUIModel.isEditable() || - !handler.isActionEnabled(demandeUIModel, MailAction.ARCHIVE, handler.getConfiguration())) { + !handler.isActionEnabled(demandeUIModel, MailAction.ARCHIVE)) { notArchivableDemandTitles += "- " + demandeUIModel.getTitle() + "<br/>"; } else { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java index 953735f..14a88cd 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java @@ -67,7 +67,7 @@ public class OpenMailFolderChooserFromListAction extends AbstractFaxToMailAction String notTransmitableDemandsTitle = ""; for (DemandeUIModel demandeUIModel : selectedEmails) { if (!demandeUIModel.isEditable() || - !handler.isActionEnabled(demandeUIModel, MailAction.TRANSMIT, handler.getConfiguration())) { + !handler.isActionEnabled(demandeUIModel, MailAction.TRANSMIT)) { notTransmitableDemandsTitle += "- " + demandeUIModel.getTitle() + "<br/>"; } else { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 8898d99..b69fe3a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -23,10 +23,10 @@ package com.franciaflex.faxtomail.ui.swing.util; */ import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.MailAction; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; @@ -56,10 +56,22 @@ import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ComboBoxModel; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.JRootPane; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; -import java.awt.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -455,13 +467,18 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> }); } - public boolean isActionEnabled(DemandeUIModel model, MailAction action, Configuration config) { + public boolean isActionEnabled(DemandeUIModel model, MailAction action) { WaitingState waitingState = model.getWaitingState(); boolean valid = model.isValid(); + MailFolder folderWithInvalidFormDisabledActions = model.getMailFolder(); + while (folderWithInvalidFormDisabledActions.getParent() != null + && !folderWithInvalidFormDisabledActions.isUseCurrentLevelInvalidFormDisabledActions()) { + folderWithInvalidFormDisabledActions = folderWithInvalidFormDisabledActions.getParent(); + } boolean enabled = - waitingState == null && (valid || !FaxToMailServiceUtils.contains(config.getInvalidFormDisabledActions(), action)) + waitingState == null && (valid || !FaxToMailServiceUtils.contains(folderWithInvalidFormDisabledActions.getInvalidFormDisabledActions(), action)) || waitingState != null && (valid && !FaxToMailServiceUtils.contains(waitingState.getValidFormDisabledActions(), action) || !valid && !FaxToMailServiceUtils.contains(waitingState.getInvalidFormDisabledActions(), action)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit dee381539edf7eff5665f16c3264489932e09991 Merge: 78af899 2bc31a1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 16:32:16 2017 +0100 Merge branch 'feature/9106_deplacement_parametrage_actions_invalides_dans_arborescence' into develop .../src/main/xmi/faxtomail.properties | 4 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33882 -> 35274 bytes ..._170314__move_invalidformactions_to_folders.sql | 10 ++++ ..._170314__move_invalidformactions_to_folders.sql | 10 ++++ .../swing/actions/PrintOnDefaultPrinterAction.java | 2 +- .../content/demande/DemandeListUIHandler.java | 2 +- .../swing/content/demande/DemandesUIHandler.java | 10 ++-- .../demande/actions/ArchiveFromListAction.java | 2 +- .../OpenMailFolderChooserFromListAction.java | 2 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++++++++-- .../WEB-INF/content/admin/configuration-input.jsp | 57 ++++++++++++++++----- .../src/main/webapp/js/configuration.js | 43 ++++++++++------ 12 files changed, 126 insertions(+), 43 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm