branch develop updated (dd3a3cd -> 3ced46d)
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 dd3a3cd fixes #9094 Demandes toujours ouvertes en modification new a6d3711 refs #9094 fix npe new 52d9074 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers new 4c24877 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin new 21cd5b7 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente new 3ced46d fixes #9109 Simplifier le message pour quitter la demande The 5 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 3ced46d131b9d11f36f4284dbbce64867a88ab1d Merge: dd3a3cd 21cd5b7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 09:41:49 2017 +0100 fixes #9109 Simplifier le message pour quitter la demande commit 21cd5b7a2a376c0c07b689461d7853f5b24f23e8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:08:18 2017 +0100 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente commit 4c24877333730733bd28bbb5298e3aafbb89e4a8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:07:53 2017 +0100 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin commit 52d907448bc866ce614b2bf9dbc95b7b39704395 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:07:33 2017 +0100 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers commit a6d3711c2d2a48abb67baf9e12dc6ae8f514f165 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 14:54:11 2017 +0100 refs #9094 fix npe Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35474 -> 35540 bytes .../V2_4_170316_3__add_displayHelpOnMessages.sql | 4 +++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 ++++ .../ui/swing/actions/ShowDemandeAction.java | 38 ++++++++++---------- .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++++++----------- .../actions/OpenGroupedDemandAction.java | 32 +++++++++-------- .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++++++++++--- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +++ .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++ .../src/main/webapp/js/configuration.js | 4 +++ 11 files changed, 125 insertions(+), 59 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.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 a6d3711c2d2a48abb67baf9e12dc6ae8f514f165 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 14:54:11 2017 +0100 refs #9094 fix npe --- .../ui/swing/actions/ShowDemandeAction.java | 38 +++++++++++----------- .../actions/OpenGroupedDemandAction.java | 32 +++++++++--------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index b375c0b..d672138 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -89,24 +89,24 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { FaxToMailUser takenBy = email.getTakenBy(); - MailFolder folderWithMustTakeToEditDemand = email.getMailFolder(); - while (folderWithMustTakeToEditDemand.getParent() != null - && folderWithMustTakeToEditDemand.getMustTakeToEditDemand() == null) { - folderWithMustTakeToEditDemand = folderWithMustTakeToEditDemand.getParent(); - } - if (BooleanUtils.isTrue(folderWithMustTakeToEditDemand.getMustTakeToEditDemand())) { - // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? - if (takenBy != null && !currentUser.equals(takenBy)) { + // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? + if (takenBy != null && !currentUser.equals(takenBy)) { + MailFolder folderWithMustTakeToEditDemand = email.getMailFolder(); + while (folderWithMustTakeToEditDemand.getParent() != null + && folderWithMustTakeToEditDemand.getMustTakeToEditDemand() == null) { + folderWithMustTakeToEditDemand = folderWithMustTakeToEditDemand.getParent(); + } + if (BooleanUtils.isTrue(folderWithMustTakeToEditDemand.getMustTakeToEditDemand())) { String htmlMessage = String.format( AbstractApplicationUIHandler.CONFIRMATION_FORMAT, t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), t("faxtomail.alert.alreadyTakenBy.help")); int answer = JOptionPane.showConfirmDialog(getHandler().getTopestUI(), - htmlMessage, - t("faxtomail.alert.alreadyTakenBy.title"), - JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE); + htmlMessage, + t("faxtomail.alert.alreadyTakenBy.title"), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); // si on annule, on délock if (answer == JOptionPane.CANCEL_OPTION) { @@ -128,14 +128,14 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { } } + } else { + takeEmail = false; + JOptionPane.showConfirmDialog(getHandler().getTopestUI(), + t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), + t("faxtomail.alert.alreadyTakenBy.title"), + JOptionPane.DEFAULT_OPTION, + JOptionPane.WARNING_MESSAGE); } - } else { - takeEmail = false; - JOptionPane.showConfirmDialog(getHandler().getTopestUI(), - t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), - t("faxtomail.alert.alreadyTakenBy.title"), - JOptionPane.DEFAULT_OPTION, - JOptionPane.WARNING_MESSAGE); } } // le mail est locké, soit on rejette, soit on ouvre en lecture seule, en fonction de la conf du dossier diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java index 375b3cb..aa5b357 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java @@ -85,14 +85,15 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo FaxToMailUser takenBy = email.getTakenBy(); - MailFolder folderWithMustTakeToEditDemand = email.getMailFolder(); - while (folderWithMustTakeToEditDemand.getParent() != null - && folderWithMustTakeToEditDemand.getMustTakeToEditDemand() == null) { - folderWithMustTakeToEditDemand = folderWithMustTakeToEditDemand.getParent(); - } - if (BooleanUtils.isTrue(folderWithMustTakeToEditDemand.getMustTakeToEditDemand())) { - // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? - if (takenBy != null && !currentUser.equals(takenBy)) { + // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? + if (takenBy != null && !currentUser.equals(takenBy)) { + + MailFolder folderWithMustTakeToEditDemand = email.getMailFolder(); + while (folderWithMustTakeToEditDemand.getParent() != null + && folderWithMustTakeToEditDemand.getMustTakeToEditDemand() == null) { + folderWithMustTakeToEditDemand = folderWithMustTakeToEditDemand.getParent(); + } + if (BooleanUtils.isTrue(folderWithMustTakeToEditDemand.getMustTakeToEditDemand())) { String htmlMessage = String.format( AbstractApplicationUIHandler.CONFIRMATION_FORMAT, t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), @@ -123,14 +124,15 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo demandToOpen.setEditable(true); } } + + } else { + takeEmail = false; + JOptionPane.showConfirmDialog(getHandler().getTopestUI(), + t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), + t("faxtomail.alert.alreadyTakenBy.title"), + JOptionPane.DEFAULT_OPTION, + JOptionPane.WARNING_MESSAGE); } - } else { - takeEmail = false; - JOptionPane.showConfirmDialog(getHandler().getTopestUI(), - t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), - t("faxtomail.alert.alreadyTakenBy.title"), - JOptionPane.DEFAULT_OPTION, - JOptionPane.WARNING_MESSAGE); } } // le mail est locké, on ne fait rien -- 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 52d907448bc866ce614b2bf9dbc95b7b39704395 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:07:33 2017 +0100 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35474 -> 35540 bytes .../h2/V2_4_170316_3__add_displayHelpOnMessages.sql | 4 ++++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 320a7fe..8b5e84b 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_4_170316_3__add_displayHelpOnMessages.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_3__add_displayHelpOnMessages.sql new file mode 100644 index 0000000..20836ae --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_3__add_displayHelpOnMessages.sql @@ -0,0 +1,4 @@ +-- add displayHelpOnMessages + +alter table mailfolder add displayHelpOnMessages boolean; +update mailfolder set displayHelpOnMessages = 't' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql new file mode 100644 index 0000000..95219de --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql @@ -0,0 +1,6 @@ +-- add mustTakeToEditDemand + +alter table mailfolder add displayHelpOnMessages bit; +GO +update mailfolder set displayHelpOnMessages = 1 where parent is null; +GO \ 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 4c24877333730733bd28bbb5298e3aafbb89e4a8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:07:53 2017 +0100 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++++++++++ faxtomail-ui-web/src/main/webapp/js/configuration.js | 4 ++++ 2 files changed, 21 insertions(+) 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 8baa452..f8ea653 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 @@ -566,6 +566,23 @@ </label> </div> + <div class="form-group"> + <label class="control-label">Afficher l'aide sur le message à la fermeture d'un élément non enregistré ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.displayHelpOnMessages" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.displayHelpOnMessages" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.displayHelpOnMessages" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.displayHelpOnMessages ? 'Oui' : 'Non'}}) + </label> + </div> + <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelNbElementToDisplay" ng-value="false" /> Hériter du nombre d'éléments à afficher à l'utilisateur :</label> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 9eaaefc..8e05e58 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -783,6 +783,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly = $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly || false; $scope.selectedMailFolder.canViewOriginalAttachments = $scope.selectedMailFolder.canViewOriginalAttachments || false; $scope.selectedMailFolder.mustTakeToEditDemand = $scope.selectedMailFolder.mustTakeToEditDemand || false; + $scope.selectedMailFolder.displayHelpOnMessages = $scope.selectedMailFolder.displayHelpOnMessages || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; } @@ -882,6 +883,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.mustTakeToEditDemand)) { $scope.parentScopeValues.mustTakeToEditDemand = folder.mustTakeToEditDemand; } + if (angular.isUndefined($scope.parentScopeValues.displayHelpOnMessages)) { + $scope.parentScopeValues.displayHelpOnMessages = folder.displayHelpOnMessages; + } if (angular.isUndefined($scope.parentScopeValues.ediTransfer)) { $scope.parentScopeValues.ediTransfer = folder.ediTransfer; } -- 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 21cd5b7a2a376c0c07b689461d7853f5b24f23e8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:08:18 2017 +0100 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente --- .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++++++------------ .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++++++++++--- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +++ 4 files changed, 58 insertions(+), 25 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 4f21964..260698e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -83,6 +83,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -159,22 +160,6 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, leftVerticalSplitPanel.setName("leftVerticalSplitPanel" + newRangePanelVisible); getContext().getSwingSession().add(leftVerticalSplitPanel, true); } - - -// if (newType != null && (oldType == null -// || !Objects.equals(FaxToMailServiceUtils.contains(oldType.getRequiredFields(), MailField.RANGE_ROW), -// FaxToMailServiceUtils.contains(newType.getRequiredFields(), MailField.RANGE_ROW)))) { -// -// if (FaxToMailServiceUtils.contains(newType.getRequiredFields(), MailField.RANGE_ROW)) { -// if (dividerLocation < 0) { -// dividerLocation = leftVerticalSplitPanel.getLeftComponent().getPreferredSize().height + 10; -// } -// leftVerticalSplitPanel.setDividerLocation(dividerLocation); -// -// } else { -// dividerLocation = leftVerticalSplitPanel.getDividerLocation(); -// } -// } } }; @@ -498,15 +483,28 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, @Override public boolean quitUI() { - boolean result = quitScreen2( + MailFolder folderWithShowHelp = getModel().getMailFolder(); + while (folderWithShowHelp.getParent() != null && folderWithShowHelp.getDisplayHelpOnMessages() == null) { + folderWithShowHelp = folderWithShowHelp.getParent(); + } + boolean showHelp = Boolean.TRUE.equals(folderWithShowHelp.getDisplayHelpOnMessages()); + String askCancelEditBeforeLeavingMessage; + String askSaveBeforeLeavingMessage; + if (showHelp) { + askCancelEditBeforeLeavingMessage = n("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave"); + askSaveBeforeLeavingMessage = n("faxtomail.demande.askSaveBeforeLeaving.save"); + } else { + askCancelEditBeforeLeavingMessage = n("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave.noHelp"); + askSaveBeforeLeavingMessage = n("faxtomail.demande.askSaveBeforeLeaving.save.noHelp"); + } + return quitScreen2( true, getModel().isModify(), - t("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave"), - t("faxtomail.demande.askSaveBeforeLeaving.save"), + t(askCancelEditBeforeLeavingMessage), + t(askSaveBeforeLeavingMessage), + showHelp, getContext().getActionFactory().createLogicAction(this, SaveDemandeAction.class) ); - - return result; } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index 177307d..703fee7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -272,6 +272,7 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo getModel().isModify(), null, t("faxtomail.pdfEditor.askSaveBeforeLeaving.save"), + true, generateAnnotatedAttachmentAction ); 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 b69fe3a..67b9d32 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 @@ -357,20 +357,20 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> * @param saveAction * @return */ - protected boolean quitScreen2(boolean modelIsValid, boolean modelIsModify, String askGiveUpMessage, String askSaveMessage, - AbstractApplicationAction saveAction) { + protected boolean quitScreen2(boolean modelIsValid, boolean modelIsModify, String askGiveUpMessage, + String askSaveMessage, boolean showHelp, AbstractApplicationAction saveAction) { boolean result; if (!modelIsValid) { // model is not valid // ask user to qui or not - result = askCancelEditBeforeLeaving(askGiveUpMessage); + result = askCancelEditBeforeLeaving(askGiveUpMessage, showHelp); } else if (modelIsModify) { // something is modify ask user what to do - int answer = askSaveBeforeLeaving(askSaveMessage); + int answer = askSaveBeforeLeaving(askSaveMessage, showHelp); switch (answer) { case JOptionPane.YES_OPTION: @@ -402,6 +402,36 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> return result; } + public int askSaveBeforeLeaving(String message, boolean showHelp) { + int result; + if (showHelp) { + result = super.askSaveBeforeLeaving(message); + } else { + result = JOptionPane.showConfirmDialog( + getTopestUI(), + message, + t("jaxx.application.common.askSaveBeforeLeaving.title"), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + } + return result; + } + + public boolean askCancelEditBeforeLeaving(String message, boolean showHelp) { + boolean result; + if (showHelp) { + result = super.askCancelEditBeforeLeaving(message); + } else { + result = JOptionPane.OK_OPTION == JOptionPane.showConfirmDialog( + getTopestUI(), + message, + t("jaxx.application.common.askCancelEditBeforeLeaving.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + } + return result; + } + public void closeFrame() { JFrame frame = getParentContainer(JFrame.class); closeFrame(frame, this); diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 8bb0cdc..847581e 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -109,7 +109,9 @@ faxtomail.demandRepliesCellRenderer.text=(%s) faxtomail.demande.archive.button.label=Archiver faxtomail.demande.archivedBy.label=Archivé par faxtomail.demande.askCancelEditBeforeLeaving.cancelSave=L'élément n'est pas valide et ne peut être sauvé. +faxtomail.demande.askCancelEditBeforeLeaving.cancelSave.noHelp=L'élément n'est pas valide et ne peut être sauvé. Les modifications ne seront pas enregistrées. faxtomail.demande.askSaveBeforeLeaving.save=Vous avez modifié l'élément mais vous n'avez pas enregistré ces modifications. +faxtomail.demande.askSaveBeforeLeaving.save.noHelp=Voulez-vous enregistrer les modifications effectuées ? faxtomail.demande.attachment.label=Pièces-jointes faxtomail.demande.back.button.label=Quitter faxtomail.demande.body.label=Corps du mail @@ -354,6 +356,8 @@ faxtomail.validator.error.reply.to.email=Le champ 'A\:' doit être une adresse e faxtomail.validator.error.reply.to.required=Le champ 'A\:' est requis \! faxtomail.validator.error.signingSettings.name.required= faxtomail.validator.error.signingSettings.text.required= +jaxx.application.common.askCancelEditBeforeLeaving.title= +jaxx.application.common.askSaveBeforeLeaving.title= jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.open=Erreur lors de l'ouverture de la pièce jointe jaxx.application.error.cannot.print=Erreur lors de l'impression -- 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 3ced46d131b9d11f36f4284dbbce64867a88ab1d Merge: dd3a3cd 21cd5b7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 09:41:49 2017 +0100 fixes #9109 Simplifier le message pour quitter la demande faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35474 -> 35540 bytes .../V2_4_170316_3__add_displayHelpOnMessages.sql | 4 +++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 ++++ .../ui/swing/actions/ShowDemandeAction.java | 38 ++++++++++---------- .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++++++----------- .../actions/OpenGroupedDemandAction.java | 32 +++++++++-------- .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++++++++++--- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +++ .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++ .../src/main/webapp/js/configuration.js | 4 +++ 11 files changed, 125 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm