branch develop updated (280e0a73 -> 8bc256bb)
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 280e0a73 refs #9526 move the takenby validation in an action new 49086922 fix (old) typo new 3a4475f1 add license headers new 0f4407a5 fix do not take email if open in readonly mode new 8bc256bb refs #9526 disable actions if folder is not writable 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 8bc256bb7db0c10fc51da6de340c25f115d7268f Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 18:09:50 2017 +0100 refs #9526 disable actions if folder is not writable commit 0f4407a587ac0191e767866bd2ea5e7d2feeb6fc Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 18:09:06 2017 +0100 fix do not take email if open in readonly mode commit 3a4475f15292ddd3f6f989217343320daa65fe5c Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 17:37:27 2017 +0100 add license headers commit 49086922df84556d1ee28705e94d4636c84b7fb8 Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 17:36:59 2017 +0100 fix (old) typo Summary of changes: .../validators/FaxToMailEmailsValidator.java | 24 ++++++++++++++++++++++ .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../content/demande/DemandeListUIHandler.java | 6 +++--- .../demande/actions/OpenTakenByFormAction.java | 24 ++++++++++++++++++++++ .../demande/takenby/TakenByFormUIHandler.java | 24 ++++++++++++++++++++++ .../demande/takenby/TakenByFormUIModel.java | 24 ++++++++++++++++++++++ .../util/FaxToMailValidatorMessageWidget.java | 24 ++++++++++++++++++++++ .../src/main/webapp/js/configuration.js | 2 +- 8 files changed, 125 insertions(+), 5 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 49086922df84556d1ee28705e94d4636c84b7fb8 Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 17:36:59 2017 +0100 fix (old) typo --- faxtomail-ui-web/src/main/webapp/js/configuration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 33f894c2..c971efe5 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -940,7 +940,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.company)) { $scope.parentScopeValues.company = folder.company; } - if ((!$scope.parentScDeopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { + if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; } if (angular.isUndefined($scope.parentScopeValues.displayOnlyUserTrigraphInTables)) { -- 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 3a4475f15292ddd3f6f989217343320daa65fe5c Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 17:37:27 2017 +0100 add license headers --- .../validators/FaxToMailEmailsValidator.java | 24 ++++++++++++++++++++++ .../demande/actions/OpenTakenByFormAction.java | 24 ++++++++++++++++++++++ .../demande/takenby/TakenByFormUIHandler.java | 24 ++++++++++++++++++++++ .../demande/takenby/TakenByFormUIModel.java | 24 ++++++++++++++++++++++ .../util/FaxToMailValidatorMessageWidget.java | 24 ++++++++++++++++++++++ 5 files changed, 120 insertions(+) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java index 9001b936..3608d86a 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.services.validators; +/*- + * #%L + * FaxToMail :: Service + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import com.opensymphony.xwork2.validator.validators.EmailValidator; /** 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 index 97c27ed7..a6922956 100644 --- 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 @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.service.MailFolderService; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java index ed759833..e5764878 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.takenby; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.nuiton.jaxx.application.swing.util.Cancelable; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIModel.java index 15db1c4b..afa974e8 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIModel.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.takenby; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailValidatorMessageWidget.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailValidatorMessageWidget.java index 107f4fee..255ffb05 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailValidatorMessageWidget.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailValidatorMessageWidget.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.util; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import jaxx.runtime.validator.swing.SwingValidatorMessageWidget; import org.nuiton.jaxx.application.swing.util.CloseableUI; -- 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 0f4407a587ac0191e767866bd2ea5e7d2feeb6fc Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 18:09:06 2017 +0100 fix do not take email if open in readonly mode --- .../com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index f66bc9d1..b4115440 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -90,7 +90,7 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { FaxToMailUser takenBy = email.getTakenBy(); // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? - if (takenBy != null && !currentUser.equals(takenBy)) { + if (currentEmail.isEditable() && takenBy != null && !currentUser.equals(takenBy)) { MailFolder folderWithMustTakeToEditDemand = email.getMailFolder(); while (folderWithMustTakeToEditDemand.getParent() != null && folderWithMustTakeToEditDemand.getMustTakeToEditDemand() == null) { -- 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 8bc256bb7db0c10fc51da6de340c25f115d7268f Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 15 18:09:50 2017 +0100 refs #9526 disable actions if folder is not writable --- .../faxtomail/ui/swing/content/demande/DemandeListUIHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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..7dd1c0c6 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 @@ -786,10 +786,10 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem && model.getSelectedEmails().get(0).isEditable() && isActionEnabled(model.getSelectedEmails().get(0), MailAction.FORWARD)); - model.setArchiveEnabled(selectedRowCount > 0); - model.setTransmitEnabled(selectedRowCount > 0); + model.setArchiveEnabled(model.getSelectedFolder().isFolderWritable() && selectedRowCount > 0); + model.setTransmitEnabled(model.getSelectedFolder().isFolderWritable() && selectedRowCount > 0); model.setPrintEnabled(selectedRowCount > 0); - model.setTakenByEnabled(selectedRowCount > 0); + model.setTakenByEnabled(model.getSelectedFolder().isFolderWritable() && selectedRowCount > 0); } /** -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm