erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (xmlui): added method to convert data form result to XMLUI:

Browse source 
- former method was misnamed as it was used to convert data form element to XMLUI, so it has been renamed to dataFormEltResult2XMLUI
    - dataFormResult2XMLUI is now use to convert wokkel.data_form.Form instances to XMLUI
This commit is contained in:
Goffi 2017-10-01 12:21:23 +02:00
commit df038ad3d4
2 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/plugin_xep_0050.py
View file

@ -324,7 +324,7 @@ class XEP_0050(object):
)
if session_id is None:
return xml_tools.dataFormResult2XMLUI(data_elt)
return xml_tools.dataFormEltResult2XMLUI(data_elt)
form = data_form.Form.fromElement(data_elt)
# we add any present note to the instructions
form.instructions.extend(self._mergeNotes(notes))

6
src/plugins/plugin_xep_0055.py
View file

@ -270,7 +270,7 @@ class XEP_0055(object):
@param elt (domish.Element): form result element
"""
if [child for child in elt.children if child.name == "item"]:
headers, xmlui_data = xml_tools.dataFormResult2XMLUIData(elt)
headers, xmlui_data = xml_tools.dataFormEltResult2XMLUIData(elt)
if "jid" in headers: # use XMLUI JidsListWidget to display the results
values = {}
for i in range(len(xmlui_data)):
@ -297,7 +297,7 @@ class XEP_0055(object):
@return: a deferred XMLUI instance
"""
d = self.getFieldsUI(jid.JID(to_jid_s), profile_key)
d.addCallback(lambda form: xml_tools.dataFormResult2XMLUI(form).toXml())
d.addCallback(lambda form: xml_tools.dataFormEltResult2XMLUI(form).toXml())
return d
def getFieldsUI(self, to_jid, profile_key):
@ -356,7 +356,7 @@ class XEP_0055(object):
@return: a deferred XMLUI string representation
"""
d = self.searchRequest(jid.JID(to_jid_s), search_data, profile_key)
d.addCallback(lambda form: xml_tools.dataFormResult2XMLUI(form).toXml())
d.addCallback(lambda form: xml_tools.dataFormEltResult2XMLUI(form).toXml())
return d
def searchRequest(self, to_jid, search_data, profile_key):