Merge branch 'develop' into FX-alan-message-access-slow

app/controllers/users_controller.rb

@@ -423,7 +423,7 @@ class UsersController < ApplicationController
   end
 
   def choose_user_course
-    homework = HomeworkCommon.find params[:homework].to_i
+    homework = HomeworkCommon.find params[:send_id].to_i
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
       @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}

app/views/files/_upload_course_files.erb

@@ -25,7 +25,7 @@
           <div class="mb5">
             <label class="fl c_dark f14" style="margin-top: 4px;">附件描述：</label>
             <div class="fl">
-              <input  type="text" name="description"  placeholder="文件描述" class="fl W120 ">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
             </div>
             <div class="cl"></div>
           </div>