branch develop updated (1d25793 -> 471e315)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 1d25793 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 0a46ceb Erreur d'enregistrement des images des tampons fixes #7506 new 471e315 Possibilité de supprimer un tampon fixes #7506 The 2 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 471e31520b21e7f0647390bd6e720a8927911478 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 3 15:18:53 2015 +0200 Possibilité de supprimer un tampon fixes #7506 commit 0a46ceb9c94f330b57c5ada0bbacbd42d21528c6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 3 15:10:36 2015 +0200 Erreur d'enregistrement des images des tampons fixes #7506 Summary of changes: .../services/service/ConfigurationServiceImpl.java | 3 +++ .../WEB-INF/content/admin/configuration-input.jsp | 13 +++++++--- .../src/main/webapp/js/configuration.js | 30 +++++++++++++++++++--- 3 files changed, 38 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 http://git.codelutin.com/faxtomail.git commit 0a46ceb9c94f330b57c5ada0bbacbd42d21528c6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 3 15:10:36 2015 +0200 Erreur d'enregistrement des images des tampons fixes #7506 --- .../WEB-INF/content/admin/configuration-input.jsp | 6 +++--- faxtomail-ui-web/src/main/webapp/js/configuration.js | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) 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 264a771..c69d3b1 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 @@ -260,7 +260,7 @@ </div> <div class="form-group"> - <label><input type="radio" ng-model="selectedStamp.isImageType" ng-value="true" /> + <label><input type="radio" ng-model="selectedStamp.isImageType" ng-value="true"/> Image :</label> <div ng-show="selectedStamp.isImageType"> @@ -708,12 +708,12 @@ </div> </div> - <!-- Sélection des états d'attentes possibles pour ce dossier --> + <!-- Sélection des états d'attente possibles pour ce dossier --> <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse3"> - Sélection des états d'attentes possibles pour ce dossier + Sélection des états d'attente possibles pour ce dossier </a> </h4> </div> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 80da58d..f4e16ea 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -353,8 +353,21 @@ ConfigurationModule.controller('ConfigurationStampsController', ['$scope', '$win for (var i = 0 ; i < $scope.stamps.length ; i++) { var stamp = $scope.stamps[i]; stamp.isImageType = stamp.image != null; + stamp.oldImage = stamp.image; + stamp.oldText = stamp.text; } + $scope.$watch("selectedStamp.isImageType", function(newValue) { + if (newValue) { + $scope.selectedStamp.text = null; + $scope.selectedStamp.image = $scope.selectedStamp.oldImage; + + } else { + $scope.selectedStamp.image = null; + $scope.selectedStamp.text = $scope.selectedStamp.oldText; + } + }); + // edition d'un tampon $scope.editStamp = function(stamp) { @@ -413,7 +426,10 @@ ConfigurationModule.controller('ConfigurationStampsController', ['$scope', '$win // Closure to capture the file information. reader.onloadend = function() { - $scope.selectedStamp.image = reader.result; + $scope.$apply(function() { + $scope.selectedStamp.image = reader.result; + $scope.selectedStamp.oldImage = reader.result; + }); $('#stampPreview').attr('src', reader.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 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>.
participants (1)
-
codelutin.com scm