Author: kmorin Date: 2014-04-03 17:06:12 +0200 (Thu, 03 Apr 2014) New Revision: 28 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/28 Log: refs #4665 [ECRAN] Transfert Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryListUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-03 14:21:15 UTC (rev 27) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-03 15:06:12 UTC (rev 28) @@ -50,7 +50,7 @@ HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); Set<String> fieldSet = Sets.newHashSet(modifiedFields); - if (modifiedFields.length > 0) { + if (!fieldSet.isEmpty() && !fieldSet.contains(Email.PROPERTY_TAKEN_BY)) { email.setTakenBy(user); fieldSet.add(Email.PROPERTY_TAKEN_BY); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-04-03 14:21:15 UTC (rev 27) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-04-03 15:06:12 UTC (rev 28) @@ -1,9 +1,12 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.MailFolderChooserUI; import com.franciaflex.faxtomail.ui.swing.content.demande.MailFolderChooserUIHandler; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXUtil; /** * @author Kevin Morin (Code Lutin) @@ -19,10 +22,14 @@ public void doAction() throws Exception { DemandeUIModel model = getModel(); model.setDemandStatus(DemandStatus.QUALIFIED); + model.setTakenBy(null); //TODO kmorin 20140306 -// SaveDemandeAction action = getContext().getActionFactory().createLogicAction(getContext().getMainUI().getHandler(), SaveDemandeAction.class); -// action.setDemandeModel(getModel()); -// getContext().getActionEngine().runAction(action); + DemandeUI parentUI = (DemandeUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); + SaveDemandeAction action = getContext().getActionFactory().createLogicAction(parentUI.getHandler(), + SaveDemandeAndExitAction.class); + getContext().getActionEngine().runAction(action); + + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryListUIHandler.java 2014-04-03 14:21:15 UTC (rev 27) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryListUIHandler.java 2014-04-03 15:06:12 UTC (rev 28) @@ -114,7 +114,7 @@ if (fields != null) { for (String field : fields) { String label; - if (I18n.hasKey(field)) { + if (I18n.hasKey("faxtomail.demande." + field + ".label")) { label = t("faxtomail.demande." + field + ".label"); } else { label = field;