branch feature/9101_disable_open_unmodified_attachment updated (2850bc4 -> dac305a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards 2850bc4 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale adds 612fdef fixes #9097 ajout de la colonne imprimé le adds 404df93 [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development adds 6535bec [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4183bc2 [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions adds 282973c [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions adds 7febca8 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' adds efb4aad [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4adc0cb [jgitflow-maven-plugin]Updating develop poms back to pre merge state new eb8efb3 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale new 96e2192 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers new 315f884 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin new dac305a refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2850bc4) \ N -- N -- N refs/heads/feature/9101_disable_open_unmodified_attachment (dac305a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 4 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 dac305a08631ea20abb10e14653b37768938740b Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:29:39 2017 +0100 refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente commit 315f88482cb0248f6bcc1e8f59e3d26a057a302e Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:29:19 2017 +0100 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin commit 96e2192a0db2477015e7b7bb2839db4ad138a7b8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:28:58 2017 +0100 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers commit eb8efb321c6d4d193f8a0cd8c49ceabeb7f7b447 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 12:05:09 2017 +0100 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 13 +++++++++++ .../persistence/entities/EmailTopiaDao.java | 11 +++++++++ .../faxtomail/persistence/entities/MailField.java | 6 +++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35274 -> 35417 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 2 ++ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++++ .../V2_2_3_170315__add_last_printing_date.sql | 14 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 +++++ faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 26 +++++++++++++++------ .../attachment/AttachmentEditorUIModel.java | 13 +++++++++++ .../ui/swing/content/attachment/AttachmentItem.css | 10 ++++++-- .../swing/content/attachment/AttachmentItem.jaxx | 6 +++-- .../content/attachment/AttachmentModelAware.java | 2 ++ .../swing/content/attachment/ButtonAttachment.java | 5 ++++ .../content/demande/DemandeListUIHandler.java | 4 ++++ .../ui/swing/content/demande/DemandeUIModel.java | 26 +++++++++++++++++++-- .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 +++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/SearchAction.java | 6 +++++ .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 17 ++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ pom.xml | 2 +- 31 files changed, 190 insertions(+), 21 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315__add_last_printing_date.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315__add_last_printing_date.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql -- 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 feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit eb8efb321c6d4d193f8a0cd8c49ceabeb7f7b447 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 12:05:09 2017 +0100 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale --- .../ui/swing/content/attachment/AttachmentEditorUIHandler.java | 9 +++++++++ .../faxtomail/ui/swing/content/attachment/AttachmentItem.css | 1 + .../faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index a8d4b0a..dc36ac0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -52,6 +52,7 @@ import javax.swing.table.TableModel; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; @@ -160,6 +161,12 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac getContext().getActionEngine().runAction(openAttachmentAction); } + public void onLabelClicked(MouseEvent event, Attachment attachment) { + if (event.getClickCount() == 2) { + editAttachment(attachment); + } + } + public void editAttachment(Attachment attachment) { OpenAttachmentAction openAttachmentAction = new OpenAttachmentAction(this); AttachmentEditorUIModel model = getModel(); @@ -287,6 +294,8 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac } attachmentItem.setEditable(getModel().isEditable()); + //TODO kmorin 20170315 get it in the folder conf + attachmentItem.setOriginalViewable(false); return attachmentItem; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css index 55f6209..c1c1e62 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css @@ -38,6 +38,7 @@ #openAttachmentButton { actionIcon: "open-file"; toolTipText: "faxtomail.attachmentEditor.action.open.tip"; + visible: { isOriginalViewable() }; } #editAttachmentButton { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx index 2362bf0..f6e0bf7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx @@ -38,7 +38,9 @@ <Boolean id="editable" javaBean='null'/> - <JLabel id='attachmentNameLabel' constraints='BorderLayout.CENTER'/> + <Boolean id="originalViewable" javaBean="null"/> + + <JLabel id='attachmentNameLabel' constraints='BorderLayout.CENTER' onMouseClicked="handler.onLabelClicked(event, attachment)"/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openAttachmentButton' -- 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 feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 96e2192a0db2477015e7b7bb2839db4ad138a7b8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:28:58 2017 +0100 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35324 -> 35417 bytes ...2_4_170316_1__add_canViewOriginalAttachments.sql | 4 ++++ ...2_4_170316_1__add_canViewOriginalAttachments.sql | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 4a6d63e..f17aeea 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/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql new file mode 100644 index 0000000..78ad067 --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql @@ -0,0 +1,4 @@ +-- add canViewOriginalAttachments + +alter table mailfolder add canViewOriginalAttachments boolean; +update mailfolder set canViewOriginalAttachments = 't' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql new file mode 100644 index 0000000..9de4822 --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql @@ -0,0 +1,6 @@ +-- add canViewOriginalAttachments + +alter table mailfolder add canViewOriginalAttachments bit; +GO +update mailfolder set canViewOriginalAttachments = 1 where parent is null; +GO \ No newline at end of file -- 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 feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 315f88482cb0248f6bcc1e8f59e3d26a057a302e Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:29:19 2017 +0100 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++++++++++ faxtomail-ui-web/src/main/webapp/js/configuration.js | 4 ++++ 2 files changed, 21 insertions(+) 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 a08dc36..0255c2c 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 @@ -532,6 +532,23 @@ </label> </div> + <div class="form-group"> + <label class="control-label">Permettre l'ouverture des versions non-modifiées des pièces-jointes ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.canViewOriginalAttachments ? 'Oui' : 'Non'}}) + </label> + </div> + <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelNbElementToDisplay" ng-value="false" /> Hériter du nombre d'éléments à afficher à l'utilisateur :</label> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 29e98f6..d6610ec 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -781,6 +781,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.printActionEqualTakeAction = $scope.selectedMailFolder.printActionEqualTakeAction || false; $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken = $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken || false; $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly = $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly || false; + $scope.selectedMailFolder.canViewOriginalAttachments = $scope.selectedMailFolder.canViewOriginalAttachments || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; } @@ -874,6 +875,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.lockedDemandsOpenableInReadOnly)) { $scope.parentScopeValues.lockedDemandsOpenableInReadOnly = folder.lockedDemandsOpenableInReadOnly; } + if (angular.isUndefined($scope.parentScopeValues.canViewOriginalAttachments)) { + $scope.parentScopeValues.canViewOriginalAttachments = folder.canViewOriginalAttachments; + } 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit dac305a08631ea20abb10e14653b37768938740b Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:29:39 2017 +0100 refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente --- .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 26 ++++++++++++++++------ .../attachment/AttachmentEditorUIModel.java | 13 +++++++++++ .../ui/swing/content/attachment/AttachmentItem.css | 10 +++++++-- .../swing/content/attachment/AttachmentItem.jaxx | 6 +++-- .../content/attachment/AttachmentModelAware.java | 2 ++ .../swing/content/attachment/ButtonAttachment.java | 5 +++++ .../ui/swing/content/demande/DemandeUIModel.java | 14 ++++++++++++ 8 files changed, 66 insertions(+), 12 deletions(-) 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 0401a2e..b4c6355 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 @@ -98,7 +98,7 @@ public class AttachmentCellEditor extends AbstractCellEditor implements TableCel DemandeTableModel tableModel = (DemandeTableModel) table.getModel(); int modelRow = table.convertRowIndexToModel(row); - final DemandeUIModel model = (DemandeUIModel) tableModel.getEntry(modelRow); + final DemandeUIModel model = tableModel.getEntry(modelRow); editorButton.init(model); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index dc36ac0..512a73a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -153,7 +153,17 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac return null; } - public void openAttachment(Attachment attachment) { + public void onLabelClicked(MouseEvent event, Attachment attachment) { + if (event.getClickCount() == 2) { + if (getModel().isEditable()) { + editAttachment(attachment); + } else { + openAttachment(attachment); + } + } + } + + public void openOriginalAttachment(Attachment attachment) { OpenAttachmentAction openAttachmentAction = new OpenAttachmentAction(this); openAttachmentAction.setAttachment(attachment, true); @@ -161,10 +171,12 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac getContext().getActionEngine().runAction(openAttachmentAction); } - public void onLabelClicked(MouseEvent event, Attachment attachment) { - if (event.getClickCount() == 2) { - editAttachment(attachment); - } + public void openAttachment(Attachment attachment) { + OpenAttachmentAction openAttachmentAction = new OpenAttachmentAction(this); + openAttachmentAction.setAttachment(attachment, attachment.getEditedFileName() == null); + + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runAction(openAttachmentAction); } public void editAttachment(Attachment attachment) { @@ -256,6 +268,7 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac } setEditable(getModel().isEditable()); + setOriginalViewable(getModel().isCanViewOriginalAttachments()); return this; } @@ -294,8 +307,7 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac } attachmentItem.setEditable(getModel().isEditable()); - //TODO kmorin 20170315 get it in the folder conf - attachmentItem.setOriginalViewable(false); + attachmentItem.setOriginalViewable(getModel().isCanViewOriginalAttachments()); return attachmentItem; } 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 7aabb5c..12667ea 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 @@ -46,6 +46,7 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach //public static final String PROPERTY_FILE = "file"; public static final String PROPERTY_EDITABLE = "editable"; + public static final String PROPERTY_CAN_VIEW_ORIGINAL_ATTACHMENTS = "canViewOriginalAttachments"; public static final String PROPERTY_INLINE_ATTACHMENTS = "inlineAttachments"; public static final String PROPERTY_SELECTED_ATTACHMENT = "selectedAttachment"; @@ -76,6 +77,8 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach //protected File file; protected boolean editable = true; + protected boolean canViewOriginalAttachments; + protected final List<Attachment> attachments = new ArrayList<Attachment>(); protected final List<Attachment> inlineAttachments = new ArrayList<Attachment>(); @@ -104,6 +107,16 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach firePropertyChange(PROPERTY_EDITABLE, oldValue, editable); } + public boolean isCanViewOriginalAttachments() { + return canViewOriginalAttachments; + } + + public void setCanViewOriginalAttachments(boolean canViewOriginalAttachments) { + Object oldValue = isCanViewOriginalAttachments(); + this.canViewOriginalAttachments = canViewOriginalAttachments; + firePropertyChange(PROPERTY_CAN_VIEW_ORIGINAL_ATTACHMENTS, oldValue, canViewOriginalAttachments); + } + public List<Attachment> getAttachment() { return attachments; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css index c1c1e62..732a786 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css @@ -35,7 +35,7 @@ floatable: false; } -#openAttachmentButton { +#openOriginalAttachmentButton { actionIcon: "open-file"; toolTipText: "faxtomail.attachmentEditor.action.open.tip"; visible: { isOriginalViewable() }; @@ -52,7 +52,7 @@ actionIcon: "folder_edit"; toolTipText: "faxtomail.attachmentEditor.action.openedited.tip"; enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; - visible: { !isEditable() }; + visible: { isOriginalViewable() && !isEditable() }; } #removeAttachmentButton { @@ -61,3 +61,9 @@ enabled: { handler != null && handler.isAttachmentRemovable(getAttachment()) }; visible: { isEditable() }; } + +#openAttachmentButton { + actionIcon: "open-file"; + toolTipText: "faxtomail.attachmentEditor.action.open.tip"; + visible: { !isOriginalViewable() && !isEditable()}; +} \ No newline at end of file diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx index f6e0bf7..31aa1b6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx @@ -43,14 +43,16 @@ <JLabel id='attachmentNameLabel' constraints='BorderLayout.CENTER' onMouseClicked="handler.onLabelClicked(event, attachment)"/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> - <JButton id='openAttachmentButton' - onActionPerformed='handler.openAttachment(attachment)'/> + <JButton id='openOriginalAttachmentButton' + onActionPerformed='handler.openOriginalAttachment(attachment)'/> <JButton id='openEditedAttachmentButton' onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='editAttachmentButton' onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='removeAttachmentButton' onActionPerformed='handler.removeAttachment(this)'/> + <JButton id='openAttachmentButton' + onActionPerformed='handler.openAttachment(attachment)'/> </JToolBar> </JPanel> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java index e7c08b3..61e8e3d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java @@ -46,4 +46,6 @@ public interface AttachmentModelAware extends Serializable { void removeAttachment(Attachment attachment); + boolean isCanViewOriginalAttachments(); + } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java index 8af8d2a..9f0ea1b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java @@ -101,6 +101,7 @@ public class ButtonAttachment extends AbstractToolbarPopupButton<AttachmentEdito popup.getModel().removePropertyChangeListener(AttachmentModelAware.PROPERTY_ATTACHMENT, listener); popup.getModel().fromEntity(model); popup.getModel().addPropertyChangeListener(AttachmentModelAware.PROPERTY_ATTACHMENT, listener); + popup.getModel().setCanViewOriginalAttachments(model != null && model.isCanViewOriginalAttachments()); setText(getButtonText(model != null ? model.getAttachment() : null)); } @@ -112,6 +113,10 @@ public class ButtonAttachment extends AbstractToolbarPopupButton<AttachmentEdito popup.getModel().setEditable(editable); } + public void setCanViewOriginalAttachments(boolean canViewOriginalAttachments) { + popup.getModel().setCanViewOriginalAttachments(canViewOriginalAttachments); + } + @Override public void onCloseUI() { super.onCloseUI(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index bcf18c0..5f85f42 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -124,6 +124,8 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU protected boolean closeable; + protected Boolean canViewOriginalAttachments; + protected static final Binder<DemandeUIModel, Email> toBeanBinder = BinderFactory.newBinder(DemandeUIModel.class, Email.class); @@ -615,6 +617,18 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU firePropertyChange(Email.PROPERTY_ATTACHMENT, oldValue, getAttachment()); } + @Override + public boolean isCanViewOriginalAttachments() { + if (canViewOriginalAttachments == null) { + MailFolder folder = getMailFolder(); + while (folder.getParent() != null && folder.getCanViewOriginalAttachments() == null) { + folder = folder.getParent(); + } + canViewOriginalAttachments = folder.getCanViewOriginalAttachments(); + } + return Boolean.TRUE.equals(canViewOriginalAttachments); + } + public void setAttachment(List<Attachment> attachment) { Object oldValue = new ArrayList<Attachment>(getAttachment()); attachments.clear(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm