jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
alan 2016-03-11 09:41:53 +08:00
parent 55983093fd 5818860a4d
commit 89438364cf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -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)}

2
app/views/files/_upload_course_files.erb
View File

@ -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>