core: discoFindByFeatures now return only available resources
This commit is contained in:
parent
a7816961dd
commit
4d4d594c60
3 changed files with 3 additions and 2 deletions
|
|
@ -728,7 +728,7 @@ class SAT(service.Service):
|
|||
resources = [None]
|
||||
else:
|
||||
try:
|
||||
resources = self.memory.getAllResources(client, jid_)
|
||||
resources = self.memory.getAvailableResources(client, jid_)
|
||||
except exceptions.UnknownEntityError:
|
||||
continue
|
||||
for resource in resources:
|
||||
|
|
|
|||
|
|
@ -655,6 +655,7 @@ class Memory(object):
|
|||
@raise exceptions.UnknownEntityError: if entity is not in cache
|
||||
@raise ValueError: entity_jid has a resource
|
||||
"""
|
||||
# FIXME: is there a need to keep cache data for resources which are not connected anymore?
|
||||
if entity_jid.resource:
|
||||
raise ValueError("getAllResources must be used with a bare jid (got {})".format(entity_jid))
|
||||
profile_cache = self._getProfileCache(client)
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ class XMLUIBase(object):
|
|||
|
||||
def _defaultCb(self, data, cb_id, profile):
|
||||
# TODO: when XMLUI updates will be managed, the _xmluiClose
|
||||
# must be called only if there is not update
|
||||
# must be called only if there is no update
|
||||
self._xmluiClose()
|
||||
self.host.actionManager(data, profile=profile)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue