we can DND a contact on another account's group if we are in merged mode. Fixes #1888
This commit is contained in:
parent
87253c461a
commit
cab5718458
|
@ -3131,8 +3131,12 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
|
||||||
if type_source != 'contact': # source is not a contact
|
if type_source != 'contact': # source is not a contact
|
||||||
return
|
return
|
||||||
source_account = model[iter_source][C_ACCOUNT].decode('utf-8')
|
source_account = model[iter_source][C_ACCOUNT].decode('utf-8')
|
||||||
if account != source_account: # dropped in another account
|
if account != source_account: # dropped in another account
|
||||||
return
|
if self.regroup and type_dest == 'group':
|
||||||
|
# on a group in merge mode is ok
|
||||||
|
account = source_account
|
||||||
|
else:
|
||||||
|
return
|
||||||
it = iter_source
|
it = iter_source
|
||||||
while model[it][C_TYPE] == 'contact':
|
while model[it][C_TYPE] == 'contact':
|
||||||
it = model.iter_parent(it)
|
it = model.iter_parent(it)
|
||||||
|
|
Loading…
Reference in New Issue