Merge branch 'educoder' into develop

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?
+    # if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil?
-      redirect_to my_account_path
+    #   redirect_to my_account_path
-    elsif user.identity == 3 && user.school_id.nil?
+    # elsif user.identity == 3 && user.school_id.nil?
-      redirect_to my_account_path
+    #   redirect_to my_account_path
-    else
+    # else
-      redirect_to User.current
+    #   redirect_to User.current
-    end
+    # end
-
+    redirect_to User.current
   end
 
 

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|