From feccad8fa5ae8b357a0334f3d63a39d9d281f77a Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 24 Nov 2014 14:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=BA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E6=88=96=E6=B2=A1=E6=9C=89=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E6=95=99=E5=B8=88=E7=9A=84=E8=AF=BE=E7=A8=8B=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=BC=95=E5=85=A5=E6=88=91?= =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/files_helper.rb | 11 +++++++++++ app/views/files/_course_list.html.erb | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index cd7603c65..399b7be1d 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -54,6 +54,17 @@ module FilesHelper s.html_safe end + #判断用户是否拥有课程,需用户在该课程中角色为教师 + def has_course? user + result = false + user.courses.each do |course| + if is_course_teacher(user,course) + return true + end + end + result + end + # 判断指定的资源时候符合类型 def isTypeOk(attachment, type, contentType) result = false diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index b8d0ad098..6e434ed14 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -21,7 +21,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 %> + <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current) %> <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course" %> @@ -31,7 +31,7 @@ <% end %> <% else %> - <%= link_to "选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true %> + <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current) %> <% end %> <% else %> <% end %>