saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.not_guest_user

This commit is contained in:
Rueshyna 2012-12-19 18:51:17 +08:00 committed by chris
parent 3d39c2c3c3
commit b4633a2ccb
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ class Admin::MemberSelectsController < ApplicationController
# @member_select_results = Role.excludes('disabled' => true)
@member_select_results = User.where(:sub_role_ids.in => params[:member_selects][:sub_role])
@member_select_results = User.not_guest_user.where(:sub_role_ids.in => params[:member_selects][:sub_role])
@member_select_search_url = admin_member_select_member_select_add_path('member_select_add')

4
app/controllers/admin/module_apps_new_interface_controller.rb
View File

@ -6,7 +6,7 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
layout "new_admin"
def setting
@sys_users = User.all(conditions: {admin: false}).includes(:avatar)
@sys_users = User.all(conditions: {admin: false}).includes(:avatar).not_guest_user
@module_app = ModuleApp.find(params[:module_app_id])
@options_from_collection_for_select_bulletin_categorys = [@module_app].collect{|ma| [ma.title,ma.id] }
# if params.has_key? :category
@ -64,4 +64,4 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
end
end

4
app/controllers/admin/object_auths_new_interface_controller.rb
View File

@ -5,7 +5,7 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
def setting
@sys_users = User.all(conditions: {admin: false}).includes(:avatar)
@sys_users = User.all(conditions: {admin: false}).includes(:avatar).not_guest_user
@ob_auth = ObjectAuth.find params[:object_auth_id]
@options_from_collection_for_select_ob_auth = @ob_auth.siblings.collect{|oa| [oa.auth_obj.pp_object,oa.id] }
@users_array = @ob_auth.privilege_users rescue []
@ -87,4 +87,4 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
@module_app = ModuleApp.first(conditions: {:key => @app_key} )
end
end
end

2
app/models/user/user.rb
View File

@ -116,7 +116,7 @@ class User
end
def self.find_by_subrole_and_status(sub_role_id,status_id) #Query for users by using specific sub_role and status key by within ID
User.where("status_record.#{sub_role_id}" => status_id,:sub_role_ids.in => [ sub_role_id ])
User.not_guest_user.where("status_record.#{sub_role_id}" => status_id,:sub_role_ids.in => [ sub_role_id ])
end
def self.find_by_status(status_id)

2
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb vendored
View File

@ -21,7 +21,7 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle
end
def setting
@sys_users = User.all(conditions: {admin: false}).includes(:avatar)
@sys_users = User.all(conditions: {admin: false}).includes(:avatar).not_guest_user
@bulletin_categorys = BulletinCategory.all
@options_from_collection_for_select_bulletin_categorys = @bulletin_categorys.collect{|bc| [bc.title,bc.id] }
if params.has_key? :category

2
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb vendored
View File

@ -1,5 +1,5 @@
<%= content_tag :div ,:id => "users_checkbox_ary",:class => 'clear' do -%>
<% sys_users = User.all -%>
<% sys_users = User.all.not_guest_user -%>
<% sys_users.each do |user| -%>
<div class="checkblock">