Skip to content

Commit

Permalink
removed ajaxGetNodes
Browse files Browse the repository at this point in the history
  • Loading branch information
@zmsdev
zmsdev committed Jul 20, 2023
1 parent e5f2dec commit 7e32126
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 63 deletions.
2 changes: 1 addition & 1 deletion Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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('<i class="fas fa-spinner fa-spin"></i>&nbsp;'+getZMILangStr('MSG_LOADING'));
var params = {lang:getZMILang(),preview:'preview'};
if (typeof that.p["params"] == "object") {
Expand Down
1 change: 1 addition & 0 deletions Products/zms/rest_api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
82 changes: 20 additions & 62 deletions Products/zms/zmsobject.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 += '<pages>'
for ref in refs:
ob = self.getLinkObj(ref)
if ob is None:
xml += '<page ref="%s" not_found="1"/>'%ref
else:
xml += ob.ajaxGetNode(context, REQUEST)
xml += "</pages>"
return xml


# --------------------------------------------------------------------------
# ZMSObject.ajaxGetNode:
# --------------------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand All @@ -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 += "<pages"
for key in REQUEST.form.keys():
Expand All @@ -1253,7 +1213,7 @@ def ajaxGetParentNodes(self, lang, xml_header=True, meta_types=None, REQUEST=Non
# ZMSObject.ajaxGetChildNodes:
# --------------------------------------------------------------------------
security.declareProtected('View', 'ajaxGetChildNodes')
def ajaxGetChildNodes(self, lang, xml_header=True, meta_types=None, REQUEST=None):
def ajaxGetChildNodes(self, meta_types=None, REQUEST=None):
""" ZMSObject.ajaxGetChildNodes """
# Get context.
context = self
Expand All @@ -1264,17 +1224,15 @@ def ajaxGetChildNodes(self, lang, xml_header=True, meta_types=None, REQUEST=None
context = self
break
# Build xml.
xml = ''
if xml_header:
RESPONSE = REQUEST.RESPONSE
content_type = 'text/xml; charset=utf-8'
filename = 'ajaxGetChildNodes.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 = 'ajaxGetChildNodes.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 += "<pages"
for key in REQUEST.form.keys():
Expand Down

0 comments on commit 7e32126

Please sign in to comment.