branch develop updated (51154fd -> 9bb7b96)
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 51154fd fixes #9099 Ajouter le tri sur les colonnes new 9bb7b96 refs #9099 correction du changement de page 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 9bb7b96c23d9e75c30e1d57cca97d95d5b0c01e5 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 30 15:13:58 2017 +0200 refs #9099 correction du changement de page Summary of changes: .../ui/swing/content/attachment/AttachmentEditorUIModel.java | 2 +- .../faxtomail/ui/swing/content/demande/DemandeListUIModel.java | 4 ++++ .../ui/swing/content/demande/actions/LoadFolderEmailsAction.java | 2 +- 3 files changed, 6 insertions(+), 2 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 9bb7b96c23d9e75c30e1d57cca97d95d5b0c01e5 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 30 15:13:58 2017 +0200 refs #9099 correction du changement de page --- .../ui/swing/content/attachment/AttachmentEditorUIModel.java | 2 +- .../faxtomail/ui/swing/content/demande/DemandeListUIModel.java | 4 ++++ .../ui/swing/content/demande/actions/LoadFolderEmailsAction.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java index 12667ea..2f06150 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java @@ -156,7 +156,7 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach this.attachments.addAll(attachments); - if (inlineAttachments.size() > 1) { + if (!inlineAttachments.isEmpty()) { this.attachments.removeAll(inlineAttachments); } else { 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 bc50c19..c38cee4 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 @@ -155,6 +155,10 @@ public class DemandeListUIModel extends AbstractSerializableBean { setPaginationParameter(PaginationParameter.of(0, resultPerPage, orderByMailField.getOrderProperty(), orderDesc)); } + public void resetOrderPaginationParameter() { + setPaginationParameter(PaginationParameter.of(paginationParameter.getPageNumber(), resultPerPage, orderByMailField.getOrderProperty(), orderDesc)); + } + public void setPaginationResult(PaginationResult<Email> paginationResult) { PaginationResult<Email> oldValue = this.paginationResult; this.paginationResult = paginationResult; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java index 82cefac..49bbe70 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java @@ -110,7 +110,7 @@ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListU // fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtrée handler.updateEmailFilterWithContextEmailFilter(); - model.resetPaginationParameterPage(); + model.resetOrderPaginationParameter(); result = true; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm