Insertion du nom de l'objet encodé, avec le SimpleTreeMaker.

diff --git a/default_blocks/tree_block_script.js b/default_blocks/tree_block_script.js
index c057e2872b7758cd8decf9d50aeccf9fdc883f12..228d405eef868bba51959af1cd18cb07351c1239 100644 (file)
--- a/default_blocks/tree_block_script.js
+++ b/default_blocks/tree_block_script.js
@@ -157,6 +157,7 @@ TreeMaker.prototype.importRows = function(req, parentRow) {
                if (row.getAttribute("state") == "-1") {
                        var stateLink = document.createElement("A");
                        stateLink.href = ".";
                if (row.getAttribute("state") == "-1") {
                        var stateLink = document.createElement("A");
                        stateLink.href = ".";

+                       stateLink.setAttribute("name", row.getAttribute("name"));

                        var stateImg = document.createElement("IMG");
                        stateImg.src = this.baseImgUrl + "pl.gif";
                        stateImg.border = "0";
                        var stateImg = document.createElement("IMG");
                        stateImg.src = this.baseImgUrl + "pl.gif";
                        stateImg.border = "0";

diff --git a/skins/xml_nav_tree.py b/skins/xml_nav_tree.py
index 30013fbb58636444064877ab0d6f35c2dfc0eccd..05967d93f5dea537d64d31a62a03cb356bdd8dad 100644 (file)
--- a/skins/xml_nav_tree.py
+++ b/skins/xml_nav_tree.py
@@ -1,5 +1,6 @@
 ##parameters=filter=''
 ##parameters=filter=''

-
+from ZTUtils import SimpleTreeMaker
+stm = SimpleTreeMaker()

 def replaceXMLEntities(text) :
        for c, ent in (('<', '&lt;'), ('>', '&gt;'), ('&', '&amp;')) :
                text = text.replace(c, ent)
 def replaceXMLEntities(text) :
        for c, ent in (('<', '&lt;'), ('>', '&gt;'), ('&', '&amp;')) :
                text = text.replace(c, ent)


@@ -18,8 +19,8 @@ for ob in context.listNearestFolderContents(contentFilter={'portal_type':filter}
        state = 0
        if not getattr(ob, 'isPortalContent', False) :
                state = ob.listNearestFolderContents(contentFilter={'portal_type':filter}) and "-1" or "0"
        state = 0
        if not getattr(ob, 'isPortalContent', False) :
                state = ob.listNearestFolderContents(contentFilter={'portal_type':filter}) and "-1" or "0"

-       row = '<row id="%(id)s" url="%(url)s" icon="%(icon)s" height="%(height)d" width="%(width)d" state="%(state)s" description="%(description)s">%(title)s</row>' % {
-                 'id' : ob.getId(),
+       row = '<row name="%(name)s" url="%(url)s" icon="%(icon)s" height="%(height)d" width="%(width)d" state="%(state)s" description="%(description)s">%(title)s</row>' % {
+                 'name' : stm.node(ob).id,

                  'url' : ob.absolute_url(),
                  'title' : ' '+replaceXMLEntities(ob.title_or_id()),
                  'description' : ob.Description().translate(rmBadAttrChars),
                  'url' : ob.absolute_url(),
                  'title' : ' '+replaceXMLEntities(ob.title_or_id()),
                  'description' : ob.Description().translate(rmBadAttrChars),