.not_guest_user
This commit is contained in:
1 parent
3d39c2c3c3
commit
b4633a2ccb
6 files changed
+8
-8
No files matched your search
@@ -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')
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
Reference in new issue
Block a user