tmp (wokkel/pubsub): fixed configuration setting
This commit is contained in:
parent
afef209d70
commit
2db9c76c4a
1 changed files with 5 additions and 3 deletions
|
|
@ -471,7 +471,7 @@ class PubSubRequest(generic.Stanza):
|
||||||
Parse optional node configuration form in create request.
|
Parse optional node configuration form in create request.
|
||||||
"""
|
"""
|
||||||
for element in verbElement.parent.elements():
|
for element in verbElement.parent.elements():
|
||||||
if element.uri == NS_PUBSUB and element.name == 'configure':
|
if element.uri == NS_PUBSUB_OWNER and element.name == 'configure':
|
||||||
form = data_form.findForm(element, NS_PUBSUB_NODE_CONFIG)
|
form = data_form.findForm(element, NS_PUBSUB_NODE_CONFIG)
|
||||||
if form is not None:
|
if form is not None:
|
||||||
if form.formType != 'submit':
|
if form.formType != 'submit':
|
||||||
|
|
@ -488,7 +488,10 @@ class PubSubRequest(generic.Stanza):
|
||||||
Render optional node configuration form in create request.
|
Render optional node configuration form in create request.
|
||||||
"""
|
"""
|
||||||
if self.options is not None:
|
if self.options is not None:
|
||||||
configure = verbElement.parent.addElement('configure')
|
if verbElement.name == 'configure':
|
||||||
|
configure = verbElement
|
||||||
|
else:
|
||||||
|
configure = verbElement.parent.addElement('configure')
|
||||||
configure.addChild(self.options.toElement())
|
configure.addChild(self.options.toElement())
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1266,7 +1269,6 @@ class PubSubService(XMPPHandler, IQHandlerMixin):
|
||||||
|
|
||||||
def _onPubSubRequest(self, iq):
|
def _onPubSubRequest(self, iq):
|
||||||
request = self._request_class.fromElement(iq)
|
request = self._request_class.fromElement(iq)
|
||||||
|
|
||||||
if self.resource is not None:
|
if self.resource is not None:
|
||||||
resource = self.resource.locateResource(request)
|
resource = self.resource.locateResource(request)
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue