diff --git a/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js b/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
index f167f02fa..839e76d7e 100644
--- a/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
+++ b/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
@@ -1244,7 +1244,7 @@ ZMIObjectTree.prototype.init = function(s,href,p) {
that.p = p;
// Init preselected active.
that.active = [];
- href = href+"/"+(typeof p['init.href'] != "undefined"?p['init.href']:"ajaxGetParentNodes");
+ href += typeof p['init.href'] != "undefined" ? '/' + p['init.href'] : '/ajaxGetParentNodes';
$(s).html(' '+getZMILangStr('MSG_LOADING'));
var params = {lang:getZMILang(),preview:'preview'};
if (typeof that.p["params"] == "object") {
diff --git a/Products/zms/rest_api.py b/Products/zms/rest_api.py
index f4450410c..140f39a55 100644
--- a/Products/zms/rest_api.py
+++ b/Products/zms/rest_api.py
@@ -69,6 +69,7 @@ def get_attrs(node, langs, monolang, REQUEST):
data['is_page'] = node.isPage()
data['is_page_element'] = node.isPageElement()
data['index_html'] = node.getHref2IndexHtmlInContext(node,REQUEST=REQUEST)
+ data['home_id'] = node.getHome().id
data['level'] = node.getLevel()
data['restricted'] = node.hasRestrictedAccess()
obj_attrs = node.getObjAttrs()
diff --git a/Products/zms/zmsobject.py b/Products/zms/zmsobject.py
index 7db66215d..3a3aad7b3 100644
--- a/Products/zms/zmsobject.py
+++ b/Products/zms/zmsobject.py
@@ -1116,44 +1116,6 @@ def getTreeNodes(self, REQUEST={}, meta_types=None):
return rtn
- # --------------------------------------------------------------------------
- # ZMSObject.ajaxGetNodes:
- # --------------------------------------------------------------------------
- security.declareProtected('View', 'ajaxGetNodes')
- def ajaxGetNodes(self, context=None, lang=None, xml_header=True, REQUEST=None):
- """ ZMSObject.ajaxGetNodes """
- context = standard.nvl(context, self)
- refs = REQUEST.get('refs', [])
- if len(refs)==0:
- for key in REQUEST.keys():
- if key.startswith('ref') and key[3:].isdigit():
- refs.append((int(key[3:]), REQUEST[key]))
- refs.sort()
- refs = [x[1] for x in refs]
-
- #-- Build xml.
- xml = ''
- if xml_header:
- RESPONSE = REQUEST.RESPONSE
- content_type = 'text/plain; charset=utf-8'
- filename = 'ajaxGetNodes.xml'
- RESPONSE.setHeader('Content-Type', content_type)
- RESPONSE.setHeader('Content-Disposition', 'inline;filename="%s"'%filename)
- RESPONSE.setHeader('Cache-Control', 'no-cache')
- RESPONSE.setHeader('Pragma', 'no-cache')
- self.f_standard_html_request( self, REQUEST)
- xml += self.getXmlHeader()
- xml += ''
- for ref in refs:
- ob = self.getLinkObj(ref)
- if ob is None:
- xml += ''%ref
- else:
- xml += ob.ajaxGetNode(context, REQUEST)
- xml += ""
- return xml
-
-
# --------------------------------------------------------------------------
# ZMSObject.ajaxGetNode:
# --------------------------------------------------------------------------
@@ -1207,7 +1169,7 @@ def ajaxGetNode(self, context, REQUEST):
# ZMSObject.ajaxGetParentNodes:
# --------------------------------------------------------------------------
security.declareProtected('View', 'ajaxGetParentNodes')
- def ajaxGetParentNodes(self, lang, xml_header=True, meta_types=None, REQUEST=None):
+ def ajaxGetParentNodes(self, REQUEST=None):
""" ZMSObject.ajaxGetParentNodes """
# Get context.
context = self
@@ -1218,17 +1180,15 @@ def ajaxGetParentNodes(self, lang, xml_header=True, meta_types=None, REQUEST=Non
context = self
break
# Build xml.
- xml = ''
- if xml_header:
- RESPONSE = REQUEST.RESPONSE
- content_type = 'text/xml; charset=utf-8'
- filename = 'ajaxGetParentNodes.xml'
- RESPONSE.setHeader('Content-Type', content_type)
- RESPONSE.setHeader('Content-Disposition', 'inline;filename="%s"'%filename)
- RESPONSE.setHeader('Cache-Control', 'no-cache')
- RESPONSE.setHeader('Pragma', 'no-cache')
- self.f_standard_html_request( self, REQUEST)
- xml += self.getXmlHeader()
+ RESPONSE = REQUEST.RESPONSE
+ content_type = 'text/xml; charset=utf-8'
+ filename = 'ajaxGetParentNodes.xml'
+ RESPONSE.setHeader('Content-Type', content_type)
+ RESPONSE.setHeader('Content-Disposition', 'inline;filename="%s"'%filename)
+ RESPONSE.setHeader('Cache-Control', 'no-cache')
+ RESPONSE.setHeader('Pragma', 'no-cache')
+ self.f_standard_html_request( self, REQUEST)
+ xml = self.getXmlHeader()
# Start-tag.
xml += "