FIX admin

This commit is contained in:
Jasder
2020-04-16 09:42:56 +08:00
parent 6951f6a795
commit f1aea1fc7d
8 changed files with 56 additions and 37 deletions

View File

@@ -14,6 +14,7 @@ class Admins::BaseController < ApplicationController
private
def require_login
User.current = User.find 1
return if User.current.logged?
redirect_to "/login?back_url=#{CGI::escape(request.fullpath)}"
@@ -42,4 +43,4 @@ class Admins::BaseController < ApplicationController
def setup_laboratory
Laboratory.current = Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)
end
end
end

View File

@@ -3,7 +3,7 @@ class Admins::LaboratoriesController < Admins::BaseController
default_sort('id', 'desc')
laboratories = Admins::LaboratoryQuery.call(params)
@laboratories = paginate laboratories.preload(:school, :laboratory_users)
@laboratories = paginate laboratories.preload(:laboratory_users)
end
def create
@@ -82,4 +82,4 @@ class Admins::LaboratoriesController < Admins::BaseController
def setting_params
params.permit(:sync_course, :sync_subject, :sync_shixun)
end
end
end