From 6a59e39ef17c0f8d8fe07e9eabcebd9c68e31879 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 18 Nov 2015 10:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=AD=A6=E7=94=9F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_file.html.erb   | 2 +-
 app/views/layouts/base_courses.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 4176b72d0..a0cb419b2 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -72,7 +72,7 @@
           <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
           <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
       <% end %>
-      <% if is_course_teacher(User.current,@course) %>  <!-- show_window('light','fade','20%','35%')-->
+      <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>  <!-- show_window('light','fade','20%','35%')-->
           <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
           <p class="c_grey fr mt10 mr5">
             上传：
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index d8a700760..1f68e0e7b 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -157,7 +157,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
-          <% if is_teacher || @course.publish_resource == 1 %>
+          <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
               <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
               <a class="subnav_green ml95 c_white" href="javascript:void(0);" onclick="course_files_upload();">+上传资源 </a>
           <% end %>