From echatellier@users.forge.codelutin.com Fri Jun  6 10:10:52 2014
From: echatellier@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r141 - in	trunk/faxtomail-ui-web/src/main/webapp:
 WEB-INF/content/admin js
Date: Fri, 06 Jun 2014 10:10:52 +0200
Message-ID: <20140606081052.A4AA7181DD7@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0059263154600477467=="

--===============0059263154600477467==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 au=
tomatique 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/config=
uration-input.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-06 07:56:32 UTC (rev 140)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-06 08:10:52 UTC (rev 141)
@@ -206,11 +206,11 @@
               <div class=3D"col-md-4">
                 <h3>Dossiers <a class=3D"btn btn-xs btn-success pull-right" =
ng-click=3D"newRoot()">Nouveau</a></h3>
                 <script type=3D"text/ng-template" id=3D"nodes_renderer.html">
-                    <div ui-tree-handle ng-click=3D"editMailFolder(mailFolde=
r)" ng-class=3D"{'bg-success' : mailFolder =3D=3D selectedMailFolder}">
+                    <div ui-tree-handle ng-class=3D"{'bg-success' : mailFold=
er =3D=3D selectedMailFolder}">
                       <a class=3D"btn btn-success btn-xs" data-nodrag ng-cli=
ck=3D"toggle(this)" ng-disabled=3D"!mailFolder.children || mailFolder.childre=
n.length =3D=3D 0">
                         <span class=3D"glyphicon" ng-class=3D"{'glyphicon-ch=
evron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span>
                       </a>
-                      {{mailFolder.name}} <span class=3D"badge">{{mailFolder=
.$cumulativeCount}}</span>
+                      <a ng-click=3D"editMailFolder(mailFolder)">{{mailFolde=
r.name}} <span class=3D"badge">{{mailFolder.$cumulativeCount}}</span></a>
                       <a class=3D"pull-right btn btn-primary btn-xs" data-no=
drag ng-click=3D"newSubFolder(this)" style=3D"margin-left: 8px;"><span class=
=3D"glyphicon glyphicon-plus"></span></a>
                       <a class=3D"pull-right btn btn-danger btn-xs" data-nod=
rag ng-click=3D"deleteFolder(this)" ng-disabled=3D"mailFolder.$cumulativeCoun=
t > 0"
                         tooltip=3D"{{mailFolder.$cumulativeCount > 0 && 'Ce =
dossier contient ' + mailFolder.$cumulativeCount + ' demandes !'|| 'Supprimer=
 ce dossier'}}">

Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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', 'Config=
urationData',
+  function($scope, ConfigurationData) {
     //{Map} les actions possibles pour les etats d'attentes
     $scope.mailActions =3D ConfigurationData.mailActions;
     //{Map} les champs obligatoires possibles
@@ -93,8 +93,8 @@
 /**
  * Misc tab controller.
  */
-ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$h=
ttp', '$window', 'ConfigurationData',
-  function($scope, $http, $window, ConfigurationData) {
+ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$w=
indow', 'ConfigurationData',
+  function($scope, $window, ConfigurationData) {
     //{Object} L'object configuration
     $scope.configuration =3D ConfigurationData.configuration;
=20
@@ -117,8 +117,8 @@
 /**
  * Etat attente tab controller.
  */
-ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scop=
e', '$http', '$window', 'ConfigurationData',
-  function($scope, $http, $window, ConfigurationData) {
+ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scop=
e', '$window', 'ConfigurationData',
+  function($scope, $window, ConfigurationData) {
=20
     //{Object} etat d'attente selectionn=C3=A9
     $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=C3=A9
     $scope.selectedDemandType;
=20
@@ -261,12 +261,19 @@
       var nodeData =3D scope.$modelValue;
       var name =3D $window.prompt("Nom du nouveau noeud ? ");
       if (name) {
-        nodeData.children.push({
-          topiaId: "new_" + guid(),
-          name: name,
-          children: []
-        });
-        $scope._updateFlatMailFolders(); // update flat map
+        var newNode =3D {
+            topiaId: "new_" + guid(),
+            name: name,
+            children: []
+          };
+        // extend node (in faxtomail collapsed =3D extended)
+        scope.collapse();
+        // append new node
+        nodeData.children.push(newNode);
+        // edition automatique
+        $scope.editMailFolder(newNode);
+        // update flat map
+        $scope._updateFlatMailFolders();=20
       }
     };
=20


--===============0059263154600477467==--