From 2b3edbc8fb7293e70efe5ccf49e74f31dafb0657 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 5 Dec 2014 09:54:13 +0800
Subject: [PATCH] =?UTF-8?q?#1663=20=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93--=E5=85=A8=E7=AB=99=E6=90=9C=E7=B4=A2=EF=BC=9A?=
 =?UTF-8?q?=E8=80=81=E5=B8=88=E4=B8=8D=E8=83=BD=E5=BC=95=E7=94=A8=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=B5=84=E6=BA=90=E8=87=B3=E6=88=91=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/files_helper.rb           | 7 ++++---
 app/views/files/_course_list.html.erb | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 5683b9a05..2cd6b4400 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -1,5 +1,6 @@
 # encoding: utf-8
 module FilesHelper
+  include AttachmentsHelper
 
   def downloadAll containers
     paths = []
@@ -54,11 +55,11 @@ module FilesHelper
     s.html_safe
   end
 
-  #判断用户是否拥有除current_course以外的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期
-  def has_course? user,current_course
+  #判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期
+  def has_course? user,file
     result = false
     user.courses.each do |course|
-      if current_course.id != course.id && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
+      if !course_contains_attachment?(course,file) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
         return true
       end
     end
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 58fbcb2e9..a006ef8ab 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -20,7 +20,7 @@
         <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
         <% if User.current.logged? %>
           <% if is_course_teacher(User.current,@course) && file.author_id == User.current.id %>
-            <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,@course) %>
+            <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,file) %>
 
             <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
               <span id="is_public_<%= file.id %>">
@@ -30,7 +30,7 @@
               <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
             <% end %>
           <% else %>
-           <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,@course) %>
+           <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,file) %>
           <% end %>
         <% else %>
         <% end %>