diff options
| author | Badlop <badlop@process-one.net> | 2017-03-09 19:21:45 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2017-03-09 19:21:45 +0100 |
| commit | ee849338dd1c9238b92ea3dca50a1b6bfd600a30 (patch) | |
| tree | 2068511673772fd710efd7d125e074668bec3eb1 /src | |
| parent | Remove mod_pubsub from ejd2sql export, as it isn't implemented (#1584) (diff) | |
Include shared groups also when contact is is personal roster (#1585)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_shared_roster.erl | 4 | ||||
| -rw-r--r-- | src/mod_shared_roster_ldap.erl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 8a775cb5..67b5870a 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -166,10 +166,12 @@ get_user_roster(Items, US) -> case dict:find(US1, SRUsers1) of - {ok, _GroupNames} -> + {ok, GroupNames} -> {Item#roster{subscription = both, + groups = + Item#roster.groups ++ GroupNames, ask = none}, dict:erase(US1, diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl index 47ba9f08..8e6aee0c 100644 --- a/src/mod_shared_roster_ldap.erl +++ b/src/mod_shared_roster_ldap.erl @@ -113,10 +113,12 @@ get_user_roster(Items, {U, S} = US) -> case dict:find(US1, SRUsers1) of - {ok, _GroupNames} -> + {ok, GroupNames} -> {Item#roster{subscription = both, + groups = + Item#roster.groups ++ GroupNames, ask = none}, dict:erase(US1, |