资源提示统计数字及权限修改

app/controllers/files_controller.rb

@@ -444,9 +444,35 @@ class FilesController < ApplicationController
 
   # 获取提示中私有、公开总数信息
   def get_attachment_for_tip all_attachment
-    @tip_all_attachments = all_attachment.count
+
     @tip_all_public_attachments = all_attachment.select{|attach| attach.is_public == 1}.count
+    if params[:project_id]
+      if User.current.member_of?(@project) || User.current.admin?
+        @tip_all_attachments = all_attachment.count
+        @tip_all_private_attachments =  all_attachment.select{|attach| attach.is_public == 0}.count
+      else
+        if params[:tag_name]
+          @tip_all_attachments = all_attachment.count
+          @tip_all_private_attachments = 0
+        else
+          @tip_all_attachments = Attachment.where(:container_id => params[:project_id], :container_type => "Project").count
+          @tip_all_private_attachments = Attachment.where(:container_id => params[:project_id], :container_type => "Project", :is_public => 0).count
+        end
+      end
+    elsif params[:course_id]
+      if User.current.member_of_course?(@course) || User.current.admin?
+        @tip_all_attachments = all_attachment.count
         @tip_all_private_attachments =  all_attachment.select{|attach| attach.is_public == 0}.count
+      else
+        if params[:tag_name]
+          @tip_all_attachments = all_attachment.count
+          @tip_all_private_attachments = 0
+        else
+          @tip_all_attachments = Attachment.where(:container_id => params[:course_id], :container_type => "Course").count
+          @tip_all_private_attachments = Attachment.where(:container_id => params[:course_id], :container_type => "Course", :is_public => 0).count
+        end
+      end
+    end
   end
 
   def quote_resource_show

app/helpers/application_helper.rb

@@ -820,6 +820,11 @@ module ApplicationHelper
     return @result
   end
 
+  def show_attachment_tip container_id, container_type
+    atts = Attachment.where(:container_id => container_id, :container_type => container_type, :is_public => 0)
+    atts.count > 0 ? true :false
+  end
+
   # 必须是项目成，项目必须提交过代码
   def allow_pull_request project
     return false if project.gpid.nil?

app/views/files/_project_file.html.erb

@@ -102,12 +102,14 @@
       </div>
     </div>
     <div class="cl"></div>
+    <% if !User.current.member_of?(@project) && show_attachment_tip(@project.id, "Project") %>
         <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 => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}  %>

app/views/files/_tip_attachment_count.html.erb

@@ -1,3 +1,15 @@
 共有&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>
+    <% end %>
+<% end %>

app/views/layouts/base_courses.html.erb

@@ -1,5 +1,6 @@
 <%# course_model %>
-<% course_file_num = visable_attachemnts_incourse(@course).count%>
+<%# course_file_num = visable_attachemnts_incourse(@course).count%>
+<% course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% homework_num = visable_course_homework @course %>
 

public/stylesheets/css/public.css

@@ -100,7 +100,7 @@ a.sendButtonBlue:hover {color:#ffffff;}
 a.resourcesTypeAll {background:url(../images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
 a.resourcesTypeAtt {background:url(../images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
 a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px no-repeat; padding-left:23px;}
-.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
+.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;z-index: 999;}
 /*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/