FIX: always include admins in 'assign' allowed users list.
This commit is contained in:
parent
1a041b49e0
commit
eb02ac1ef5
|
@ -69,7 +69,7 @@ after_initialize do
|
||||||
|
|
||||||
add_class_method(:user, :assign_allowed) do
|
add_class_method(:user, :assign_allowed) do
|
||||||
allowed_groups = SiteSetting.assign_allowed_on_groups.split('|')
|
allowed_groups = SiteSetting.assign_allowed_on_groups.split('|')
|
||||||
where("users.id IN (
|
where("users.admin OR users.id IN (
|
||||||
SELECT user_id FROM group_users
|
SELECT user_id FROM group_users
|
||||||
INNER JOIN groups ON group_users.group_id = groups.id
|
INNER JOIN groups ON group_users.group_id = groups.id
|
||||||
WHERE groups.#{attribute} IN (?)
|
WHERE groups.#{attribute} IN (?)
|
||||||
|
|
Loading…
Reference in New Issue