branch feature/9526 created (now cc3b9e56)
This is an automated email from the git hooks/post-receive script. New change to branch feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at cc3b9e56 refs #9526 - Pris par sur le clic droit des demandes sélectionnées : - Ajout de l'option dans le modèle - Ajout de la migration associée - Ajout de l'option dans la configuration This branch includes the following new commits: new cc3b9e56 refs #9526 - Pris par sur le clic droit des demandes sélectionnées : - Ajout de l'option dans le modèle - Ajout de la migration associée - Ajout de l'option dans la configuration 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 cc3b9e566e3c5df7b0e09f8d58ac551e73063608 Author: Jean Couteau <jean.couteau@gmail.com> Date: Tue Nov 28 16:54:23 2017 +0100 refs #9526 - Pris par sur le clic droit des demandes sélectionnées : - Ajout de l'option dans le modèle - Ajout de la migration associée - Ajout de l'option dans la configuration Testé manuellement l'enregistrement de la configuration -- 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/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit cc3b9e566e3c5df7b0e09f8d58ac551e73063608 Author: Jean Couteau <jean.couteau@gmail.com> Date: Tue Nov 28 16:54:23 2017 +0100 refs #9526 - Pris par sur le clic droit des demandes sélectionnées : - Ajout de l'option dans le modèle - Ajout de la migration associée - Ajout de l'option dans la configuration Testé manuellement l'enregistrement de la configuration --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36206 -> 36261 bytes .../h2/V2_4_171128_1__add_showTakenByAction.sql | 4 ++++ .../V2_4_171128_1__add_showTakenByAction.sql | 6 ++++++ .../WEB-INF/content/admin/configuration-input.jsp | 16 ++++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ 5 files changed, 30 insertions(+) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 7bdf00ca..860e6db6 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_171128_1__add_showTakenByAction.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_171128_1__add_showTakenByAction.sql new file mode 100644 index 00000000..54e0c78d --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_171128_1__add_showTakenByAction.sql @@ -0,0 +1,4 @@ +-- add showTakenByAction + +alter table mailfolder add showTakenByAction boolean; +update mailfolder set showTakenByAction = 'f' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_171128_1__add_showTakenByAction.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_171128_1__add_showTakenByAction.sql new file mode 100644 index 00000000..abff6b7b --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_171128_1__add_showTakenByAction.sql @@ -0,0 +1,6 @@ +-- add showTakenByAction + +alter table mailfolder add showTakenByAction bit; +GO +update mailfolder set showTakenByAction = 0 where parent is null; +GO \ No newline at end of file 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 56157171..1d0990ee 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 @@ -685,6 +685,22 @@ ({{parentScopeValues.showForwardAction ? 'Oui' : 'Non'}}) </label> </div> + <div class="form-group"> + <label class="control-label">Afficher la fonction "Pris par" sur les éléments ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showTakenByAction" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showTakenByAction" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.showTakenByAction" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.showTakenByAction ? 'Oui' : 'Non'}}) + </label> + </div> <hr /> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index db187303..33f894c2 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -787,6 +787,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.computeQuantitiesSubtotalsByState = $scope.selectedMailFolder.computeQuantitiesSubtotalsByState || false; $scope.selectedMailFolder.showReplyAction = $scope.selectedMailFolder.showReplyAction || false; $scope.selectedMailFolder.showForwardAction = $scope.selectedMailFolder.showForwardAction || false; + $scope.selectedMailFolder.showTakenByAction = $scope.selectedMailFolder.showTakenByAction || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer || false; $scope.selectedMailFolder.displayOnlyUserTrigraphInTables = $scope.selectedMailFolder.displayOnlyUserTrigraphInTables || false; $scope.selectedMailFolder.canChangeOrderInTable = $scope.selectedMailFolder.canChangeOrderInTable || false; @@ -915,6 +916,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.showForwardAction)) { $scope.parentScopeValues.showForwardAction = folder.showForwardAction; } + if (angular.isUndefined($scope.parentScopeValues.showTakenByAction)) { + $scope.parentScopeValues.showTakenByAction = folder.showTakenByAction; + } 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>.
participants (1)
-
codelutin.com scm