developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert non rulingcom email constraint

This commit is contained in:
chris 2013-07-04 14:20:13 +08:00
parent bec0bd76e4
commit 2c331bf1a5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/member_selects_controller.rb
View File

@ -73,7 +73,8 @@ class Admin::MemberSelectsController < OrbitBackendController
@field = params[:field] @field = params[:field]
roles = Role.all roles = Role.all
@sorted_users = roles.inject({}) do |users, role| @sorted_users = roles.inject({}) do |users, role|
users[role] = role.users.where(:email.not => /guest|rulingcom/) - selected_users # users[role] = role.users.where(:email.not => /guest|rulingcom/) - selected_users
users[role] = role.users.where(:email.not => /guest/) - selected_users
users users
end end
end end
@ -82,7 +83,8 @@ class Admin::MemberSelectsController < OrbitBackendController
roles = Role.find(params[:role_ids]) rescue [] roles = Role.find(params[:role_ids]) rescue []
@field = params[:field] @field = params[:field]
@users = roles.inject([]) do |users, role| @users = roles.inject([]) do |users, role|
users += role.users.where(:email.not => /guest|rulingcom/).entries # users += role.users.where(:email.not => /guest|rulingcom/).entries
users += role.users.where(:email.not => /guest/).entries
users users
end end
render 'admin/member_selects/update_selected_users' render 'admin/member_selects/update_selected_users'