branch develop updated (ab49fc1 -> 9d98426)
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 ab49fc1 fixes #9099 mauvais tri si on affiche le nom entier dans les colonnes representant des utilisateurs + correction sur des requetes qui ne passent pas sur sqlserver new aeece0d fixes #9103 ne pas ajouter les PJ de contenu du mail new 9793385 correction du nombre de PJ dans la liste quand il y a des PJ dans divers new 9d98426 correction du séparateur qui se positionne mal au démarrage The 3 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 9d98426eb52d49347e4f11da0ac79e52d832f4d0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 11:43:52 2017 +0200 correction du séparateur qui se positionne mal au démarrage commit 9793385d0a2024885a04fdf5ba1a865ddaab7082 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 10:47:46 2017 +0200 correction du nombre de PJ dans la liste quand il y a des PJ dans divers commit aeece0d88d9ea15434d6717904007ddccfb198c1 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 10:22:23 2017 +0200 fixes #9103 ne pas ajouter les PJ de contenu du mail Summary of changes: .../faxtomail/persistence/entities/EmailTopiaDao.java | 1 + .../com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java | 4 +++- .../ui/swing/content/attachment/AttachmentCellEditor.java | 10 +++++++++- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 12 ++++++------ 4 files changed, 19 insertions(+), 8 deletions(-) -- 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 aeece0d88d9ea15434d6717904007ddccfb198c1 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 10:22:23 2017 +0200 fixes #9103 ne pas ajouter les PJ de contenu du mail --- .../faxtomail/persistence/entities/EmailTopiaDao.java | 1 + .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index aba1a85..a3d0154 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -560,6 +560,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { // add same fecth liste as emailService#getEmailForFolder() StringBuilder hqlForFetchStep1 = new StringBuilder("SELECT " + EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID); if (orderClause != null && !orderByWithSize) { + // sql server ne supporte pas les requetes order by sur des champs non selectionnes hqlForFetchStep1.append(", ").append(orderClause); } if (orderByWithSize && tableToJoin != null) { 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 4cb69d9..4cf8b7c 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 @@ -37,7 +37,6 @@ import com.franciaflex.faxtomail.ui.swing.content.reply.actions.AddAttachmentToR import com.franciaflex.faxtomail.ui.swing.content.reply.actions.SenderChangedAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.google.common.base.Strings; import com.google.common.collect.Lists; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -142,7 +141,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo new ReplyAttachmentModel(attachment, true, prefix + " - " + attachment.getOriginalFileName()); model.addAvailableAttachment(replyOriginalAttachmentModel); - if (!Strings.isNullOrEmpty(attachment.getEditedFileName())) { + if (StringUtils.isNotEmpty(attachment.getEditedFileName())) { ReplyAttachmentModel replyEditedAttachmentModel = new ReplyAttachmentModel(attachment, false, prefix + " - " + attachment.getEditedFileName()); @@ -154,7 +153,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo model.addAvailableAttachment(replyEditedAttachmentModel); } - } else if (addAttchmentToReply(demand, model, demandeUIModel, attachment)){ + } else if (addAttchmentToReply(demand, model, demandeUIModel, attachment)) { model.addAttachment(replyOriginalAttachmentModel); model.removeAvailableAttachment(replyOriginalAttachmentModel); addAttachmentToReplyAction.setReplyAttachmentModel(replyOriginalAttachmentModel); @@ -283,7 +282,8 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo protected boolean addAttchmentToReply(DemandeUIModel demand, ReplyFormUIModel model, DemandeUIModel demandeUIModel, Attachment attachment) { return model.isForward() && demandeUIModel.equals(demand) - && !attachment.isInlineAttachment() && !attachment.isLessImportant(); + && !attachment.isInlineAttachment() && !attachment.isLessImportant() + && !attachment.isMailContent() && !attachment.isAddedByUser(); } @Override @@ -460,8 +460,8 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo // Must take the value from the editor and get the value and cast it to the new type. Class<?> cls = oldValue.getClass(); try { - Method method = cls.getMethod("valueOf", new Class[]{String.class}); - newValue = method.invoke(oldValue, new Object[] { editorComponent.getText()}); + Method method = cls.getMethod("valueOf", String.class); + newValue = method.invoke(oldValue, editorComponent.getText()); } catch (Exception ex) { // Fail silently and return the newValue (a String object) } -- 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 9793385d0a2024885a04fdf5ba1a865ddaab7082 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 10:47:46 2017 +0200 correction du nombre de PJ dans la liste quand il y a des PJ dans divers --- .../ui/swing/content/attachment/AttachmentCellEditor.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java index b4c6355..613ec5a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java @@ -44,6 +44,8 @@ import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; +import java.util.List; +import java.util.ArrayList; import java.util.Date; import java.util.EventObject; @@ -161,7 +163,13 @@ public class AttachmentCellEditor extends AbstractCellEditor implements TableCel AttachmentEditorUIModel model = editorButton.getBean(); Preconditions.checkNotNull(model, "No model found in editor."); - Object result = model.getAttachment(); + List<Attachment> result = new ArrayList<>(); + if (model.getAttachment() != null) { + result.addAll(model.getAttachment()); + } + if (model.getInlineAttachments() != null) { + result.addAll(model.getInlineAttachments()); + } if (log.isDebugEnabled()) { log.debug("editor value: " + result); } -- 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 9d98426eb52d49347e4f11da0ac79e52d832f4d0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 11:43:52 2017 +0200 correction du séparateur qui se positionne mal au démarrage --- .../main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java index 738d93f..e3ecc13 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java @@ -129,7 +129,7 @@ public class RunFaxToMail { } } - public static void startFaxToMail(FaxToMailUIContext context, boolean openContext) { + public static void startFaxToMail(final FaxToMailUIContext context, boolean openContext) { if (openContext) { context.open(); @@ -147,6 +147,8 @@ public class RunFaxToMail { @Override public void run() { mainUI.setVisible(true); + // on réajoute l'ui à la session sinon le séparateur entre l'arbre et la liste se positionne mal + context.getSwingSession().add(mainUI); } }); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm