This is an automated email from the git hooks/post-receive script. New change to branch feature/9094_always_open_demand_in_edition in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at 9d244a8 refs #9094 affichage d'un message de warning et ouverture en edition This branch includes the following new commits: new 9d244a8 refs #9094 affichage d'un message de warning et ouverture en edition The 1 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 9d244a8f00c5c459b71aadc140eb2369fb1804d5 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:48:09 2017 +0100 refs #9094 affichage d'un message de warning et ouverture en edition -- 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 feature/9094_always_open_demand_in_edition in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9d244a8f00c5c459b71aadc140eb2369fb1804d5 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:48:09 2017 +0100 refs #9094 affichage d'un message de warning et ouverture en edition --- .../services/service/EmailServiceImpl.java | 19 ------ .../ui/swing/actions/ShowDemandeAction.java | 69 ++++++++++++--------- .../actions/OpenGroupedDemandAction.java | 70 ++++++++++++---------- 3 files changed, 80 insertions(+), 78 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index b2f623c..1e1b339 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -303,25 +303,6 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe folder = folder.getParent(); } -// String company = folder.getCompany(); - - // if client code is null, do not manage client at all -// Client client = null; -// if (StringUtils.isNotBlank(clientCode)) { -// Client emailClient = email.getClient(); -// if (emailClient != null && clientCode.equals(email.getClient().getCode())) { -// client = emailClient; -// -// } else { -// client = getClientService().getClientForCode(clientCode, company); -// if (client == null) { -// String message = t("faxtomail.service.email.save.clientCode.error", clientCode); -// throw new InvalidClientException(message); -// } -// } -// } -// email.setClient(client); - if (attachments != null) { updateAttachments(email, attachments, user); } 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 1b1df37..73820f9 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 @@ -79,7 +79,6 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { String topiaId = currentEmail.getTopiaId(); if (StringUtils.isNotBlank(topiaId)) { FaxToMailUser currentUser = getContext().getCurrentUser(); - int answer = -1; try { FaxToMailServiceContext serviceContext = getContext().newServiceContext(); @@ -90,37 +89,49 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { FaxToMailUser takenBy = email.getTakenBy(); - // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? - if (takenBy != null && !currentUser.equals(takenBy)) { - String htmlMessage = String.format( - AbstractApplicationUIHandler.CONFIRMATION_FORMAT, - t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), - t("faxtomail.alert.alreadyTakenBy.help")); - - answer = JOptionPane.showConfirmDialog(getHandler().getTopestUI(), - 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) { - result = false; - emailService.unlockEmail(topiaId); + // todo KMORIN 201703015 check in the folder conf + if (true) { + 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 { - // sinon on ouvre + // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? + if (takenBy != null && !currentUser.equals(takenBy)) { + 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); + + // si on annule, on délock + if (answer == JOptionPane.CANCEL_OPTION) { + result = false; + emailService.unlockEmail(topiaId); + + } else { + // sinon on ouvre + + // si on ne prend pas, le mail est en readonly + if (answer == JOptionPane.NO_OPTION) { + currentEmail.setEditable(false); + takeEmail = false; + } + // si on prend, on prend et on rend editable + else if (answer == JOptionPane.YES_OPTION) { + takeEmail = true; + currentEmail.setEditable(true); - // si on ne prend pas, le mail est en readonly - if (answer == JOptionPane.NO_OPTION) { - currentEmail.setEditable(false); - takeEmail = false; - } - // si on prend, on prend et on rend editable - else if (answer == JOptionPane.YES_OPTION) { - takeEmail = true; - currentEmail.setEditable(true); + } + } } } } 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 1fb9d83..5dba28f 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 @@ -74,7 +74,6 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo String topiaId = demandToOpen.getTopiaId(); if (StringUtils.isNotBlank(topiaId)) { FaxToMailUser currentUser = getContext().getCurrentUser(); - int answer = -1; try { FaxToMailServiceContext serviceContext = getContext().newServiceContext(); @@ -85,37 +84,48 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo FaxToMailUser takenBy = email.getTakenBy(); - // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? - if (takenBy != null && !currentUser.equals(takenBy)) { - String htmlMessage = String.format( - AbstractApplicationUIHandler.CONFIRMATION_FORMAT, - t("faxtomail.alert.alreadyTakenBy.message", decorate(takenBy)), - t("faxtomail.alert.alreadyTakenBy.help")); - - answer = JOptionPane.showConfirmDialog(getHandler().getTopestUI(), - 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) { - result = false; - emailService.unlockEmail(topiaId); + // todo KMORIN 201703015 check in the folder conf + if (true) { + 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 { - // sinon on ouvre - - // si on ne prend pas, le mail est en readonly - if (answer == JOptionPane.NO_OPTION) { - demandToOpen.setEditable(false); - takeEmail = false; - } - // si on prend, on prend et on rend editable - else if (answer == JOptionPane.YES_OPTION) { - takeEmail = true; - demandToOpen.setEditable(true); + // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? + if (takenBy != null && !currentUser.equals(takenBy)) { + 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); + + // si on annule, on délock + if (answer == JOptionPane.CANCEL_OPTION) { + result = false; + emailService.unlockEmail(topiaId); + + } else { + // sinon on ouvre + + // si on ne prend pas, le mail est en readonly + if (answer == JOptionPane.NO_OPTION) { + demandToOpen.setEditable(false); + takeEmail = false; + } + // si on prend, on prend et on rend editable + else if (answer == JOptionPane.YES_OPTION) { + takeEmail = true; + demandToOpen.setEditable(true); + } + } } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm