diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb index 3e02c579..9ac9f9ab 100644 --- a/app/controllers/ecloud_controller.rb +++ b/app/controllers/ecloud_controller.rb @@ -284,14 +284,14 @@ class EcloudController < ApplicationController self.logged_user = user user = UserExtensions.where(:user_id => User.current.id).first - if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil? - redirect_to my_account_path - elsif user.identity == 3 && user.school_id.nil? - redirect_to my_account_path - else - redirect_to User.current - end - + # if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil? + # redirect_to my_account_path + # elsif user.identity == 3 && user.school_id.nil? + # redirect_to my_account_path + # else + # redirect_to User.current + # end + redirect_to User.current end diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 884e32a8..92173fc3 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -396,7 +396,7 @@ class ManagementsController < ApplicationController # ๆœ็ดข้•œๅƒ def mirror_search @scope = [] - if params[:q] && params[:q].lstrip.rstrip != "" + if params[:q] && params[:q].strip != "" @scope = MirrorRepository.where("name like ?", "%#{params[:q]}%").map(&:name) end respond_to do |format|