From 2348e063d1ad581af450445ac35ca430182fab1a Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 21 Nov 2014 15:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=89=E5=85=A5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=BC=B9=E6=A1=86=E4=B8=AD=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/files_helper.rb | 4 ++-- app/views/files/_show_quote_resource.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index 9a0a1127f..4f3f401c9 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -44,10 +44,10 @@ module FilesHelper File.new(zipfile_name,'w+') end - def courses_check_box_tags(name,courses,current_course) + def courses_check_box_tags(name,courses,current_course,attachment) s = '' courses.each do |course| - if course.id != current_course.id && is_course_teacher(User.current,course) + if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course) s << "
" end end diff --git a/app/views/files/_show_quote_resource.html.erb b/app/views/files/_show_quote_resource.html.erb index 8041802a5..ef907f40f 100644 --- a/app/views/files/_show_quote_resource.html.erb +++ b/app/views/files/_show_quote_resource.html.erb @@ -8,7 +8,7 @@ remote: true, id: "relation_file_form" do %> <%= hidden_field_tag(:file_id, file.id) %> - <%= content_tag('div', courses_check_box_tags('courses[course][]', User.current.courses,course), :id => 'courses')%> + <%= content_tag('div', courses_check_box_tags('courses[course][]', User.current.courses,course,file), :id => 'courses')%> 引  用取  消 <% end -%>