This is an automated email from the git hooks/post-receive script. New commit to branch feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 5a0d4e2f811ec934f53daac0168f282aba1eb139 Author: Jean Couteau <jean.couteau@gmail.com> Date: Thu Dec 14 10:07:47 2017 +0100 refs #9526 : Pris par sur le clic droit des demandes sélectionnées - Modifications suite review de Kevin --- .../faxtomail/services/service/LdapServiceImpl.java | 1 - .../faxtomail/services/service/MailFolderServiceImpl.java | 9 +++++++-- .../faxtomail/ui/swing/content/demande/TakenByFormUI.css | 2 +- .../ui/swing/content/demande/TakenByFormUIModel.java | 12 ++++++++++-- .../swing/content/demande/actions/OpenTakenByFormAction.java | 7 ++++++- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java index cfc9399d..f3046486 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java @@ -446,7 +446,6 @@ public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapServ public List<FaxToMailUser> getUsersForGroup(FaxToMailUserGroup group){ FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); - FaxToMailUserGroupTopiaDao faxtomailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); List<FaxToMailUser> users = faxtomailUserDao.forUserGroupsContains(group).findAll(); return users; diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java index d4d64d28..5554c052 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java @@ -354,10 +354,15 @@ public class MailFolderServiceImpl extends FaxToMailServiceSupport implements Ma return filter; } + /** + * Get back all the users who have writing rights on a folder + * @param folderId The folder topiaId + * @return List of all the users with writing rights + */ @Override - public Collection<FaxToMailUser> getUsersForFolder(String topiaId) { + public Collection<FaxToMailUser> getUsersForFolder(String folderId) { Collection<FaxToMailUser> users = new ArrayList<>(); - MailFolder mailFolder = getMailFolder(topiaId); + MailFolder mailFolder = getMailFolder(folderId); LdapService ldapService = serviceContext.getLdapService(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css index cbce996c..23c45def 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css @@ -29,7 +29,7 @@ showReset: true; showDecorator: false; bean: {model}; - property: takenby; + property: users; selectedItem: { model.getTakenBy() }; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel.java index 460b5406..9a6d6fe3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel.java @@ -10,7 +10,9 @@ public class TakenByFormUIModel extends AbstractSerializableBean { public static final String PROPERTY_TAKENBY = "takenBy"; - protected FaxToMailUser user; + public static final String PROPERTY_DEMANDSTOTAKE = "demandsToTake"; + + public static final String PROPERTY_USERS = "users"; protected FaxToMailUser takenBy; @@ -18,12 +20,14 @@ public class TakenByFormUIModel extends AbstractSerializableBean { protected List<FaxToMailUser> users; - protected FaxToMailUser getTakenBy() { + public FaxToMailUser getTakenBy() { return this.takenBy; } public void setTakenBy(FaxToMailUser takenBy){ + Object oldValue = getTakenBy(); this.takenBy = takenBy; + firePropertyChange(PROPERTY_TAKENBY, oldValue, takenBy); } public List<DemandeUIModel> getDemandsToTake() { @@ -31,7 +35,9 @@ public class TakenByFormUIModel extends AbstractSerializableBean { } public void setDemandsToTake(List<DemandeUIModel> demandsToTake) { + Object oldValue = getDemandsToTake(); this.demandsToTake = demandsToTake; + firePropertyChange(PROPERTY_DEMANDSTOTAKE, oldValue, demandsToTake); } public List<FaxToMailUser> getUsers() { @@ -39,6 +45,8 @@ public class TakenByFormUIModel extends AbstractSerializableBean { } public void setUsers(List<FaxToMailUser> users) { + Object oldValue = getUsers(); this.users = users; + firePropertyChange(PROPERTY_USERS, oldValue, users); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java index 933d11f7..f706160c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java @@ -50,6 +50,10 @@ public class OpenTakenByFormAction extends AbstractFaxToMailAction<DemandeListUI frameContent = new TakenByFormUI(getUI()); TakenByFormUIModel model = frameContent.getModel(); + if (demandsToTake.size()==1){ + model.setTakenBy(demand.getTakenBy()); + } + model.setDemandsToTake(demandsToTake); MailFolder folder = demand.getMailFolder(); @@ -64,7 +68,8 @@ public class OpenTakenByFormAction extends AbstractFaxToMailAction<DemandeListUI @Override public void postSuccessAction() { super.postSuccessAction(); - frameContent.getTakenByComboBox().addItems(frameContent.getModel().getUsers()); + //frameContent.getTakenByComboBox().addItems(frameContent.getModel().getUsers()); + //frameContent.getTakenByComboBox().setSelectedItem(frameContent.getModel().getTakenBy()); frame = getHandler().openModalFrame(frameContent, t("faxtomail.takenby.modalTitle"), new Dimension(10, 10)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.