From 2c03bfbf3a32ee6a3b12d189710b20fa71914cf6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 2 Sep 2016 16:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8F=90=E7=A4=BA=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_file.html.erb         | 14 +++++-----
 .../files/_tip_attachment_count.html.erb      | 27 ++++++++++---------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index d3cc58c71..045eec6f7 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -124,12 +124,14 @@
       </div>
     </div>
     <div class="cl"></div>
-    <div class="resource_tip_box fontGrey2">
-      <em></em>
-      <span></span>
-      <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
-      <p>公共资源：<br/>对所有用户可见</p>
-    </div>
+    <% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %>
+        <div class="resource_tip_box fontGrey2">
+          <em></em>
+          <span></span>
+          <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
+          <p>公共资源：<br/>对所有用户可见</p>
+        </div>
+    <% end %>
   </div>
   <div  id="course_list">
     <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
diff --git a/app/views/files/_tip_attachment_count.html.erb b/app/views/files/_tip_attachment_count.html.erb
index 6a21f36be..edcbbea98 100644
--- a/app/views/files/_tip_attachment_count.html.erb
+++ b/app/views/files/_tip_attachment_count.html.erb
@@ -1,15 +1,18 @@
 共有&nbsp;<span id="attachment_count"><%= @tip_all_attachments %></span>&nbsp;个资源
-<span id="attachment_count_public" class="fontGrey2 ml10" style="font-weight: normal;">公共资源：<%= @tip_all_public_attachments %>个</span>
-<% if @project  %>
-    <% if !User.current.member_of?(@project) && params[:tag_name] %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
-    <% else %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
-    <% end %>
-<% elsif @course %>
-    <% if !User.current.member_of_course?(@course) && params[:tag_name] %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
-    <% else %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
+<% if @tip_all_private_attachments != 0 %>
+    <span id="attachment_count_public" class="fontGrey2 ml10" style="font-weight: normal;">公共资源：<%= @tip_all_public_attachments %>个</span>
+    <% if @project  %>
+        <% if !User.current.member_of?(@project) && params[:tag_name] %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
+        <% else %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
+        <% end %>
+    <% elsif @course %>
+        <% if !User.current.member_of_course?(@course) && params[:tag_name] %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
+        <% else %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
+        <% end %>
     <% end %>
+
 <% end %>