项目文档权限判断优化

app/controllers/documents_controller.rb

@@ -29,7 +29,13 @@ class DocumentsController < ApplicationController
 
   def index
     @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
-    documents = @project.documents.includes(:attachments, :category).all
+    temp = @project.documents.includes(:attachments, :category).all
+    documents = []
+    temp.each do |doc|
+      if doc.has_right?(@project)
+        documents << doc
+      end
+    end
     case @sort_by
     when 'date'
       @grouped = documents.group_by {|d| d.updated_on.to_date }

app/models/document.rb

@@ -46,6 +46,10 @@ class Document < ActiveRecord::Base
     !user.nil? && user.allowed_to?(:view_documents, project)
   end
 
+  def has_right?(project,user=User.current)
+    user.admin? || user.member_of?(project) ||  self.is_public==1
+  end
+
   def initialize(attributes=nil, *args)
     super
     if new_record?

app/views/documents/index.html.erb

@@ -27,8 +27,8 @@
 <% if @grouped.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
 
 <% @grouped.keys.sort.each do |group| %>
-    <!-- <h3><%= group %></h3> -->
-    <%= render :partial => 'documents/document', :collection => @grouped[group] %>
-<% end %> 
+        <!-- <h3><%= group %></h3> -->
+        <%= render :partial => 'documents/document', :collection => @grouped[group] %>
+<% end %>
 
 <% html_title(l(:label_document_plural)) -%>