Author: echatellier Date: 2014-06-06 10:10:52 +0200 (Fri, 06 Jun 2014) New Revision: 141 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/141 Log: refs #4662: Extension automatique du noeud parent lors de l'ajout. Edition automatique du nouveau noeud ajout?\195?\169. Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-06 07:56:32 UTC (rev 140) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-06 08:10:52 UTC (rev 141) @@ -206,11 +206,11 @@ <div class="col-md-4"> <h3>Dossiers <a class="btn btn-xs btn-success pull-right" ng-click="newRoot()">Nouveau</a></h3> <script type="text/ng-template" id="nodes_renderer.html"> - <div ui-tree-handle ng-click="editMailFolder(mailFolder)" ng-class="{'bg-success' : mailFolder == selectedMailFolder}"> + <div ui-tree-handle ng-class="{'bg-success' : mailFolder == selectedMailFolder}"> <a class="btn btn-success btn-xs" data-nodrag ng-click="toggle(this)" ng-disabled="!mailFolder.children || mailFolder.children.length == 0"> <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> - {{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span> + <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span></a> <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;"><span class="glyphicon glyphicon-plus"></span></a> <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes !'|| 'Supprimer ce dossier'}}"> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-06 07:56:32 UTC (rev 140) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-06 08:10:52 UTC (rev 141) @@ -27,8 +27,8 @@ /** * Global configuration controller. */ -ConfigurationModule.controller('ConfigurationController', ['$scope', '$http', 'ConfigurationData', - function($scope, $http, ConfigurationData) { +ConfigurationModule.controller('ConfigurationController', ['$scope', 'ConfigurationData', + function($scope, ConfigurationData) { //{Map} les actions possibles pour les etats d'attentes $scope.mailActions = ConfigurationData.mailActions; //{Map} les champs obligatoires possibles @@ -93,8 +93,8 @@ /** * Misc tab controller. */ -ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$http', '$window', 'ConfigurationData', - function($scope, $http, $window, ConfigurationData) { +ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Object} L'object configuration $scope.configuration = ConfigurationData.configuration; @@ -117,8 +117,8 @@ /** * Etat attente tab controller. */ -ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scope', '$http', '$window', 'ConfigurationData', - function($scope, $http, $window, ConfigurationData) { +ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Object} etat d'attente selectionné $scope.selectedEtatAttente; @@ -177,8 +177,8 @@ /** * Demand type tab controller. */ -ConfigurationModule.controller('ConfigurationDemandTypeController', ['$scope', '$http', '$window', 'ConfigurationData', - function($scope, $http, $window, ConfigurationData) { +ConfigurationModule.controller('ConfigurationDemandTypeController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Object} demand type selectionné $scope.selectedDemandType; @@ -261,12 +261,19 @@ var nodeData = scope.$modelValue; var name = $window.prompt("Nom du nouveau noeud ? "); if (name) { - nodeData.children.push({ - topiaId: "new_" + guid(), - name: name, - children: [] - }); - $scope._updateFlatMailFolders(); // update flat map + var newNode = { + topiaId: "new_" + guid(), + name: name, + children: [] + }; + // extend node (in faxtomail collapsed = extended) + scope.collapse(); + // append new node + nodeData.children.push(newNode); + // edition automatique + $scope.editMailFolder(newNode); + // update flat map + $scope._updateFlatMailFolders(); } };