This is an automated email from the git hooks/post-receive script. New commit to branch revert-e22af4ef in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 95f60b2c5cfc557ba4bf421ca63052a22a78a870 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Dec 15 09:39:44 2017 +0100 Revert "Merge branch 'feature/9526' into 'develop'" This reverts merge request !4 --- .../faxtomail/persistence/entities/MailAction.java | 3 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36261 -> 36206 bytes .../faxtomail/services/service/LdapService.java | 3 - .../services/service/LdapServiceImpl.java | 8 -- .../services/service/MailFolderService.java | 2 - .../services/service/MailFolderServiceImpl.java | 27 ------- .../h2/V2_4_171128_1__add_showTakenByAction.sql | 4 - .../V2_4_171128_1__add_showTakenByAction.sql | 6 -- .../ui/swing/content/demande/DemandeListUI.css | 8 -- .../ui/swing/content/demande/DemandeListUI.jaxx | 1 - .../content/demande/DemandeListUIHandler.java | 9 --- .../swing/content/demande/DemandeListUIModel.java | 26 ------ .../ui/swing/content/demande/TakenByFormUI.css | 48 ----------- .../ui/swing/content/demande/TakenByFormUI.jaxx | 89 --------------------- .../content/demande/TakenByFormUIHandler.java | 89 --------------------- .../swing/content/demande/TakenByFormUIModel.java | 66 --------------- .../demande/actions/OpenTakenByFormAction.java | 85 -------------------- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../TakenByFormUIModel-error-validation.xml | 39 --------- .../i18n/faxtomail-ui-swing_fr_FR.properties | 10 --- .../WEB-INF/content/admin/configuration-input.jsp | 16 ---- .../src/main/webapp/js/configuration.js | 4 - 22 files changed, 2 insertions(+), 543 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java index 24071735..a6bfc542 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java @@ -34,6 +34,5 @@ public enum MailAction { ARCHIVE, REPLY, FORWARD, - GROUP, - TAKENBY + GROUP } diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 860e6db6..7bdf00ca 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/java/com/franciaflex/faxtomail/services/service/LdapService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java index 579351a4..9da50dd2 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.services.service; */ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.services.FaxToMailService; import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; import com.franciaflex.faxtomail.services.service.ldap.Contact; @@ -45,6 +44,4 @@ public interface LdapService extends FaxToMailService { FaxToMailUser getUserFromPrincipal(String login) throws AuthenticationException; List<Contact> getUserAndEmails(); - - List<FaxToMailUser> getUsersForGroup(FaxToMailUserGroup group); } 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 f3046486..023992bb 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 @@ -443,12 +443,4 @@ public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapServ return result; } - - public List<FaxToMailUser> getUsersForGroup(FaxToMailUserGroup group){ - FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); - - List<FaxToMailUser> users = faxtomailUserDao.forUserGroupsContains(group).findAll(); - return users; - - } } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java index 2155cd8c..a16656e7 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java @@ -28,7 +28,6 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailService; @@ -68,5 +67,4 @@ public interface MailFolderService extends FaxToMailService { MailFilter findMailFilter(Email email, Set<String> modifiedProperties, List<Address> recipients); - Collection<FaxToMailUser> getUsersForFolder(String topiaId); } 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 5554c052..6f1f27e9 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 @@ -27,7 +27,6 @@ package com.franciaflex.faxtomail.services.service; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; @@ -354,30 +353,4 @@ 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 folderId) { - Collection<FaxToMailUser> users = new ArrayList<>(); - MailFolder mailFolder = getMailFolder(folderId); - LdapService ldapService = serviceContext.getLdapService(); - - - Hibernate.initialize(mailFolder.getWriteRightUsers()); - Hibernate.initialize(mailFolder.getWriteRightGroups()); - users.addAll(mailFolder.getWriteRightUsers()); - Collection<FaxToMailUserGroup> groups = mailFolder.getWriteRightGroups(); - for (FaxToMailUserGroup group:groups) { - users.addAll(ldapService.getUsersForGroup(group)); - } - - if (mailFolder.getParent() != null) { - users.addAll(getUsersForFolder(mailFolder.getParent().getTopiaId())); - } - return users; - } - } diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_4_171128_1__add_showTakenByAction.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_171128_1__add_showTakenByAction.sql deleted file mode 100644 index 54e0c78d..00000000 --- a/faxtomail-service/src/main/resources/db/migration/h2/V2_4_171128_1__add_showTakenByAction.sql +++ /dev/null @@ -1,4 +0,0 @@ --- add showTakenByAction - -alter table mailfolder add showTakenByAction boolean; -update mailfolder set showTakenByAction = 'f' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_171128_1__add_showTakenByAction.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_171128_1__add_showTakenByAction.sql deleted file mode 100644 index abff6b7b..00000000 --- a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_171128_1__add_showTakenByAction.sql +++ /dev/null @@ -1,6 +0,0 @@ --- add showTakenByAction - -alter table mailfolder add showTakenByAction bit; -GO -update mailfolder set showTakenByAction = 0 where parent is null; -GO \ No newline at end of file diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css index 7805ff36..12cb8247 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css @@ -118,14 +118,6 @@ _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenForwardFormAction.class }; } -#takenByMenu { - text: "faxtomail.demandeList.action.takenBy"; - toolTipText: "faxtomail.demandeList.action.takenBy.tip"; - visible: { model.isTakenByActivated() }; - enabled: { model.isTakenByEnabled() }; - _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenTakenByFormAction.class }; -} - #archiveMenu { actionIcon: archive; text: "faxtomail.demandeList.action.archive"; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx index 235adf4a..6f516731 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx @@ -64,7 +64,6 @@ <JMenuItem id='forwardMenu'/> <JMenuItem id='archiveMenu'/> <JMenuItem id='moveMenu'/> - <JMenuItem id='takenByMenu'/> </JPopupMenu> <JSplitPane constraints='BorderLayout.CENTER' id="mainSplitPane" name="demandeListUIMainSplitPane"> 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 02399b93..201b9074 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 @@ -369,14 +369,6 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem } getModel().setForwardActivated(Boolean.TRUE.equals(folderWithShowForwardAction.getShowForwardAction())); - //Init takenby visibility - MailFolder folderWithShowTakenByAction = folder; - while (folderWithShowTakenByAction.getParent() != null - && folderWithShowTakenByAction.getShowTakenByAction() == null) { - folderWithShowTakenByAction = folderWithShowTakenByAction.getParent(); - } - getModel().setTakenByActivated(Boolean.TRUE.equals(folderWithShowTakenByAction.getShowTakenByAction())); - DefaultMutableTreeNode node = nodesByFolder.get(folder); if (node != null) { navigationTree.setSelectionPath(new TreePath(node.getPath())); @@ -789,7 +781,6 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem model.setArchiveEnabled(selectedRowCount > 0); model.setTransmitEnabled(selectedRowCount > 0); model.setPrintEnabled(selectedRowCount > 0); - model.setTakenByEnabled(selectedRowCount > 0); } /** diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index 9e6dd402..c38cee47 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -53,8 +53,6 @@ public class DemandeListUIModel extends AbstractSerializableBean { public static final String PROPERTY_REPLY_ENABLED = "replyEnabled"; public static final String PROPERTY_FORWARD_ACTIVATED = "forwardActivated"; public static final String PROPERTY_FORWARD_ENABLED = "forwardEnabled"; - public static final String PROPERTY_TAKENBY_ENABLED = "takenByEnabled"; - public static final String PROPERTY_TAKENBY_ACTIVATED = "takenByActivated"; public static final String PROPERTY_ARCHIVE_ENABLED = "archiveEnabled"; public static final String PROPERTY_TRANSMIT_ENABLED = "transmitEnabled"; public static final String PROPERTY_PRINT_ENABLED = "printEnabled"; @@ -99,10 +97,6 @@ public class DemandeListUIModel extends AbstractSerializableBean { protected boolean forwardEnabled; - protected boolean takenByEnabled; - - protected boolean takenByActivated; - protected boolean archiveEnabled; protected boolean transmitEnabled; @@ -270,26 +264,6 @@ public class DemandeListUIModel extends AbstractSerializableBean { firePropertyChange(PROPERTY_FORWARD_ENABLED, oldValue, forwardEnabled); } - public boolean isTakenByActivated() { - return takenByActivated; - } - - public void setTakenByActivated(boolean takenByActivated) { - Object oldValue = isTakenByActivated(); - this.takenByActivated = takenByActivated; - firePropertyChange(PROPERTY_TAKENBY_ACTIVATED, oldValue, takenByActivated); - } - - public boolean isTakenByEnabled() { - return takenByEnabled; - } - - public void setTakenByEnabled(boolean takenByEnabled) { - Object oldValue = isTakenByEnabled(); - this.takenByEnabled = takenByEnabled; - firePropertyChange(PROPERTY_TAKENBY_ENABLED, oldValue, takenByEnabled); - } - public boolean isArchiveEnabled() { return archiveEnabled; } 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 deleted file mode 100644 index c1332a13..00000000 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css +++ /dev/null @@ -1,48 +0,0 @@ -/* - * #%L - * FaxToMail :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Mac-Groupe, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -#takenByListLabel { - text: "faxtomail.takenby.label.takenby"; -} - -#takenByComboBox { - showReset: true; - showDecorator: false; - bean: {model}; - property: takenBy; - selectedItem: { model.getTakenBy() }; - _validatorLabel: { t("faxtomail.takenby.validator.label") }; -} - -#cancelButton { - actionIcon: cancel; - text: "faxtomail.takenby.action.cancel"; - toolTipText: "faxtomail.takenby.action.cancel.tip"; -} - -#validateButton { - actionIcon: reply; - text: "faxtomail.takenby.action.validate"; - toolTipText: "faxtomail.takenby.action.validate.tip"; - enabled: { model.isValid() }; -} diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.jaxx deleted file mode 100644 index b5515579..00000000 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.jaxx +++ /dev/null @@ -1,89 +0,0 @@ -<!-- - #%L - FaxToMail :: UI - %% - Copyright (C) 2014-2017 Mac-Groupe, Code Lutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<JPanel id='takenByPanel' layout='{new BorderLayout()}' - implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<TakenByFormUIModel, TakenByFormUIHandler>'> - - <import> - com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; - com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI - com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil - com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler - - - java.awt.CardLayout - java.awt.Color - java.awt.FlowLayout - - jaxx.runtime.swing.CardLayout2Ext - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.bean.BeanComboBox - - static org.nuiton.i18n.I18n.t - </import> - - <script><![CDATA[ - - public TakenByFormUI(FaxToMailUI parentUI) { - FaxToMailUIUtil.setParentUI(this, parentUI); - } - - ]]></script> - - <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='takenBy' component='takenByComboBox'/> - </BeanValidator> - - <TakenByFormUIModel id='model' - initializer='getContextValue(TakenByFormUIModel.class)'/> - - <Table constraints='BorderLayout.NORTH' - fill='both'> - <row> - <cell> - <JLabel id="takenByListLabel"/> - </cell> - <cell weightx='1' columns="4"> - <JPanel id="takenByListPanel"> - <BeanFilterableComboBox id="takenByComboBox" - constructorParams='this' - genericType="FaxToMailUser" - constraints='"false"'/> - </JPanel> - </cell> - </row> - </Table> - - <Table id="buttonPanel" - fill="both" insets="0" - constraints='BorderLayout.SOUTH'> - <row> - <cell insets="0" weightx="1"> - <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - </cell> - <cell insets="0" weightx="1"> - <JButton id='validateButton' onActionPerformed='handler.validate()'/> - </cell> - </row> - </Table> - -</JPanel> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java deleted file mode 100644 index 9e0b6adb..00000000 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.franciaflex.faxtomail.ui.swing.content.demande; - -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; -import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; -import org.nuiton.jaxx.application.swing.util.Cancelable; -import org.nuiton.validator.bean.simple.SimpleBeanValidator; - -import javax.swing.*; -import java.awt.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.Collection; - -public class TakenByFormUIHandler extends AbstractFaxToMailUIHandler<TakenByFormUIModel, TakenByFormUI> implements Cancelable { - - @Override - public void afterInit(TakenByFormUI ui) { - initUI(ui); - - // users - initBeanFilterableComboBox(ui.getTakenByComboBox(), getModel().getUsers(), getModel().getTakenBy()); - - getValidator().addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - getModel().setValid((Boolean) evt.getNewValue()); - } - }); - } - - @Override - public void cancel() { - closeFrame(); - } - - @Override - public void onCloseUI() { - } - - @Override - public SwingValidator<TakenByFormUIModel> getValidator() { - return getUI().getValidator(); - } - - @Override - protected JComponent getComponentToFocus() { - return getUI().getTakenByComboBox(); - } - - @Override - public Component getTopestUI() { - return getParentContainer(Window.class); - } - - public void validate(){ - Collection<DemandeUIModel> demands = getModel().getDemandsToTake(); - FaxToMailUser user = (FaxToMailUser) getUI().getTakenByComboBox().getSelectedItem(); - - for (DemandeUIModel demand:demands){ - demand.setTakenBy(user); - } - - FaxToMailUIContext context = getContext(); - - FaxToMailServiceContext serviceContext = context.newServiceContext(); - EmailService emailService = serviceContext.getEmailService(); - - for (DemandeUIModel demand : getModel().getDemandsToTake()) { - - String topiaId = demand.getTopiaId(); - Email persistedEmail = emailService.getFullEmailById(topiaId); - - FaxToMailUser currentUser = context.getCurrentUser(); - Email email = demand.toEntity(persistedEmail); - - email = emailService.saveEmail(email, currentUser, Email.PROPERTY_TAKEN_BY); - demand.fromEntity(email); - } - - closeFrame(); - } - -} 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 deleted file mode 100644 index 38e0cdb8..00000000 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.franciaflex.faxtomail.ui.swing.content.demande; - - -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import org.jdesktop.beans.AbstractSerializableBean; - -import java.util.List; - -public class TakenByFormUIModel extends AbstractSerializableBean { - - public static final String PROPERTY_TAKENBY = "takenBy"; - - public static final String PROPERTY_DEMANDSTOTAKE = "demandsToTake"; - - public static final String PROPERTY_USERS = "users"; - - public static final String PROPERTY_VALID = "valid"; - - protected FaxToMailUser takenBy; - - protected List<DemandeUIModel> demandsToTake; - - protected List<FaxToMailUser> users; - - protected boolean valid; - - 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() { - return demandsToTake; - } - - public void setDemandsToTake(List<DemandeUIModel> demandsToTake) { - Object oldValue = getDemandsToTake(); - this.demandsToTake = demandsToTake; - firePropertyChange(PROPERTY_DEMANDSTOTAKE, oldValue, demandsToTake); - } - - public List<FaxToMailUser> getUsers() { - return users; - } - - public void setUsers(List<FaxToMailUser> users) { - Object oldValue = getUsers(); - this.users = users; - firePropertyChange(PROPERTY_USERS, oldValue, users); - } - - public Boolean isValid() { - return valid; - } - - public void setValid(Boolean valid) { - Object oldValue = isValid(); - this.valid = valid; - firePropertyChange(PROPERTY_VALID, oldValue, valid); - } -} 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 deleted file mode 100644 index 22331e26..00000000 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.franciaflex.faxtomail.ui.swing.content.demande.actions; - -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.services.service.MailFolderService; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.demande.TakenByFormUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.TakenByFormUIModel; - -import javax.swing.JFrame; -import javax.swing.SwingUtilities; -import java.awt.Dimension; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.List; - -import static org.nuiton.i18n.I18n.t; - -public class OpenTakenByFormAction extends AbstractFaxToMailAction<DemandeListUIModel, DemandeListUI, DemandeListUIHandler> { - - protected TakenByFormUI frameContent; - protected JFrame frame; - - public OpenTakenByFormAction(DemandeListUIHandler handler) { - super(handler, false); - } - - @Override - public void doAction() throws Exception { - List<DemandeUIModel> demandsToTake = getModel().getSelectedEmails(); - DemandeUIModel demand = demandsToTake.get(0); - - TakenByFormUIModel model = new TakenByFormUIModel(); - - if (demandsToTake.size() == 1) { - model.setTakenBy(demand.getTakenBy()); - } - - model.setDemandsToTake(demandsToTake); - - MailFolder folder = demand.getMailFolder(); - - MailFolderService mailFolderService = getContext().newServiceContext().getMailFolderService(); - List<FaxToMailUser> users = (List<FaxToMailUser>)mailFolderService.getUsersForFolder(folder.getTopiaId()); - - model.setUsers(users); - getUI().setContextValue(model); - - frameContent = new TakenByFormUI(getUI()); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); - frame = getHandler().openModalFrame(frameContent, - t("faxtomail.takenby.modalTitle"), - new Dimension(300, 30)); - - getContext().addPropertyChangeListener(FaxToMailUIContext.PROPERTY_BUSY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (!getContext().isBusy()) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - - bringCurrentDemandToFront(); - if (frame != null) { - frame.toFront(); - frame = null; - } - } - }); - getContext().removePropertyChangeListener(FaxToMailUIContext.PROPERTY_BUSY, this); - } - } - }); - } - -} diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index 8efd789f..4cf8b7cd 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -108,7 +108,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo } @Override - public void afterInit(final ReplyFormUI ui) { + public void afterInit(ReplyFormUI replyFormUI) { initUI(ui); JTextPane editor = ui.getMessage(); diff --git a/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel-error-validation.xml b/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel-error-validation.xml deleted file mode 100644 index f84a843e..00000000 --- a/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIModel-error-validation.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - FaxToMail :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2014 Mac-Groupe, Code Lutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> - -<validators> - - <field name="takenBy"> - <field-validator type="required" short-circuit="true"> - <message>faxtomail.validator.error.email.takenBy.required</message> - </field-validator> - </field> - -</validators> 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 6e4894b9..19836555 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 @@ -172,8 +172,6 @@ faxtomail.demandeList.action.print=Imprimer faxtomail.demandeList.action.print.tip=Imprimer faxtomail.demandeList.action.reply=Répondre faxtomail.demandeList.action.reply.tip=Répondre -faxtomail.demandeList.action.takenBy=Pris par -faxtomail.demandeList.action.takenBy.tip=Modifier la personne prenant l'élément faxtomail.demandeList.action.transmit=Déplacer faxtomail.demandeList.action.transmit.tip=Déplacer faxtomail.demandeList.demandNbLabel=Nombre de demandes @@ -345,13 +343,6 @@ faxtomail.searchToGroup.action.group=Grouper faxtomail.searchToGroup.action.group.tip=Grouper avec l'élément courant faxtomail.searchToGroup.title=Recherche de l'élément avec lequel grouper l'élément %s faxtomail.systemUser=Système -faxtomail.takenby.action.cancel=Annuler -faxtomail.takenby.action.cancel.tip=Annuler le changement de 'Pris par' -faxtomail.takenby.action.validate=Valider -faxtomail.takenby.action.validate.tip=Valider la personne prenant l'élément -faxtomail.takenby.label.takenby=Pris par -faxtomail.takenby.modalTitle=Modifier la personne prenant l'élément -faxtomail.takenby.validator.label= faxtomail.validator.error.email.client.required=Client requis faxtomail.validator.error.email.comment.required=Message requis faxtomail.validator.error.email.companyReference.required=Notre référence requis @@ -360,7 +351,6 @@ faxtomail.validator.error.email.object.required=Objet requis faxtomail.validator.error.email.priority.required=Priorité requise faxtomail.validator.error.email.projectReference.required=Référence chantier requise faxtomail.validator.error.email.rangeRow.required=Tableau des gammes requis -faxtomail.validator.error.email.takenBy.required='Pris par' requis faxtomail.validator.error.email.waitingState.required=État d'attente requis faxtomail.validator.error.reply.cc.email=Le champ 'Copie\:' doit être une adresse email valide \! faxtomail.validator.error.reply.cci.email=Le champ 'opie cachée\:' doit être une adresse email valide \! 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 1d0990ee..56157171 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 @@ -685,22 +685,6 @@ ({{parentScopeValues.showForwardAction ? 'Oui' : 'Non'}}) </label> </div> - <div class="form-group"> - <label class="control-label">Afficher la fonction "Pris par" sur les éléments ?</label><br /> - <label class="radio-inline"> - <input type="radio" - ng-model="selectedMailFolder.showTakenByAction" ng-value="true"> oui - </label> - <label class="radio-inline"> - <input type="radio" - ng-model="selectedMailFolder.showTakenByAction" ng-value="false"> non - </label> - <label class="radio-inline" ng-if="selectedMailFolder.$parent"> - <input type="radio" - ng-model="selectedMailFolder.showTakenByAction" ng-value="undefined"> hériter du dossier parent - ({{parentScopeValues.showTakenByAction ? 'Oui' : 'Non'}}) - </label> - </div> <hr /> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 33f894c2..db187303 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -787,7 +787,6 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.computeQuantitiesSubtotalsByState = $scope.selectedMailFolder.computeQuantitiesSubtotalsByState || false; $scope.selectedMailFolder.showReplyAction = $scope.selectedMailFolder.showReplyAction || false; $scope.selectedMailFolder.showForwardAction = $scope.selectedMailFolder.showForwardAction || false; - $scope.selectedMailFolder.showTakenByAction = $scope.selectedMailFolder.showTakenByAction || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer || false; $scope.selectedMailFolder.displayOnlyUserTrigraphInTables = $scope.selectedMailFolder.displayOnlyUserTrigraphInTables || false; $scope.selectedMailFolder.canChangeOrderInTable = $scope.selectedMailFolder.canChangeOrderInTable || false; @@ -916,9 +915,6 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.showForwardAction)) { $scope.parentScopeValues.showForwardAction = folder.showForwardAction; } - if (angular.isUndefined($scope.parentScopeValues.showTakenByAction)) { - $scope.parentScopeValues.showTakenByAction = folder.showTakenByAction; - } 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>.