This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 471e31520b21e7f0647390bd6e720a8927911478 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 3 15:18:53 2015 +0200 Possibilité de supprimer un tampon fixes #7506 --- .../faxtomail/services/service/ConfigurationServiceImpl.java | 3 +++ .../webapp/WEB-INF/content/admin/configuration-input.jsp | 7 ++++++- faxtomail-ui-web/src/main/webapp/js/configuration.js | 12 +++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java index 1f787cc..0e89d40 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java @@ -206,6 +206,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements stampDao.create(currentStamp); } } + + // delete remaining (not done here, done after reference cleaning) + stampDao.deleteAll(allStampsIndex.values()); } /** 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 c69d3b1..aded7c7 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 @@ -244,7 +244,12 @@ <tr ng-repeat="stamp in stamps" ng-class="{'info' : stamp == selectedStamp}" ng-click="editStamp(stamp)"> - <td>{{stamp.label}}</td> + <td> + {{stamp.label}} + <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteStamp(stamp, $index)" + tooltip="Supprimer ce tampon"> + <span class="glyphicon glyphicon-remove"></span></a> + </td> </tr> </tbody> </table> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index f4e16ea..98f84a1 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -410,15 +410,21 @@ ConfigurationModule.controller('ConfigurationStampsController', ['$scope', '$win } }; + // suppression d'un tampon + $scope.deleteStamp = function(stamp, index) { + if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce tampon ?")) { + $scope.stamps.splice(index, 1); + $scope.selectedStamp = null; + } + }; + $scope.imageChanged = function(input) { var f = input.files[0]; // FileList object // Only process image files. if (!f.type.match('image.*')) { - console.log("erorr"); - + $window.alert("Erreur lors du chargement de l'image"); $('#stampPreview').attr('src', null); - //TODO error } var reader = new FileReader(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.