Changeset 6764

Timestamp:

10/04/06 19:41:07 (5 years ago)

Author:

sys

Message:

Controle d'unicité des codes de modèles et de générateurs non case sensitive.

File:

• trunk/Xul_CmsBuilder/content/scenaricmsbuilder/infoWsp/infowsp.xbl.xml (modified) (4 diffs)

trunk/Xul_CmsBuilder/content/scenaricmsbuilder/infoWsp/infowsp.xbl.xml

@@ -323 +323 @@
                                         while(vModel) {
                                                 if(vModel.nodeName=="model") {
-                                                        var vCd = vModel.getAttribute("code");
+                                                        //Controle non case-sensotive (système de fichier windows)
+                                                        var vCd = vModel.getAttribute("code").toUpperCase();
                                                         if( vCd in vMapCodes) {
                                                                 vModel.fNextCdConflict = vMapCodes[vCd];
@@ -340 +341 @@
                                                         }
                                                 }else if(vModel.nodeName=="generator"){
-                                                        var vCd = vModel.getAttribute("code");
+                                                        //Controle non case-sensotive (système de fichier windows)
+                                                        var vCd = vModel.getAttribute("code").toUpperCase();
                                                         if( vCd in vMapGeneratorCodes) {
                                                                 vModel.fNextCdConflict = vMapGeneratorCodes[vCd];
@@ -356 +358 @@
                                                 if(vMapCodes[vCd].fNextCdConflict) {
                                                         //Au moins 2 modèles avec Code en conflit
+                                                        var vModel = vMapCodes[vCd];
                                                         var vDivTitle = document.createElementNS(HTMLNS, "conflict");
-                                                        vDivTitle.appendChild(document.createTextNode("Same code : "+vCd));
+                                                        vDivTitle.appendChild(document.createTextNode("Same code : "+vModel.getAttribute("code")));
                                 
                                                         var vUL = document.createElementNS(HTMLNS, "ul");
-                                                        var vModel = vMapCodes[vCd];
                                                         while(vModel) {
                                                                 var vItView = document.createElementNS(HTMLNS, "itemView");
@@ -384 +386 @@
                                                 if(vMapGeneratorCodes[vCd].fNextCdConflict) {
                                                         //Au moins 2 générateurs avec Code en conflit
+                                                        var vGenerator = vMapGeneratorCodes[vCd];
                                                         var vDivTitle = document.createElementNS(HTMLNS, "conflict");
-                                                        vDivTitle.appendChild(document.createTextNode("Same generator code : " + vCd));
+                                                        vDivTitle.appendChild(document.createTextNode("Same generator code : " + vGenerator.getAttribute("code")));
                                 
                                                         var vUL = document.createElementNS(HTMLNS, "ul");
-                                                        var vGenerator = vMapGeneratorCodes[vCd];
                                                         while(vGenerator) {
                                                                 var vItView = document.createElementNS(HTMLNS, "itemView");