Merge branch 'dev_aliyun' into educoder

app/controllers/managements_controller.rb

@@ -223,7 +223,9 @@ class ManagementsController < ApplicationController
           @user.admin = params[:admin].to_i
         end
         @user.firstname = ""
-        @user.mail = params[:mail].strip == "" ? nil : params[:mail]
+        if params[:mail].present?
+          @user.mail = params[:mail].strip
+        end
         @user.phone = params[:phone].strip == "" ? nil : params[:phone]
         #@user.password = params[:new_password]
         # if params[:new_password].strip != "" && params[:new_password_confirmation].strip != ""

app/views/ec_years/graduation_requirement.html.erb

@@ -152,9 +152,9 @@
       console.log("#########type:"+ type)
       console.log("#########url:"+ url)
 
-      var requirement = $("input[name='requirement']").val();
+      var requirement = $("textarea[name='requirement']").val();
       if(requirement.trim() == ""){
-          $("input[name='requirement']").addClass("bor-red");
+          $("textarea[name='requirement']").addClass("bor-red");
           $("#option_Item_notice").removeClass("none").html("内容不能为空");
           return;
       }
@@ -181,7 +181,7 @@
               }
           })
           console.log(in_vain);
-          $("input[name='requirement']").removeClass("bor-red");
+          $("textarea[name='requirement']").removeClass("bor-red");
           $("input[name='subitems[]']").removeClass("bor-red");
           $("#option_Item_notice").addClass("none");
       }