elsif project
project_clauses << "#{Project.table_name}.id = %d" % project.id
end
- project_clauses << Issue.visible_condition(User.current)
- project_clauses.join(' AND ')
+ project_clauses.any? ? project_clauses.join(' AND ') : nil
end
def statement
end if filters and valid?
- (filters_clauses << project_statement).join(' AND ')
+ filters_clauses << project_statement
+ filters_clauses.reject!(&:blank?)
+
+ filters_clauses.any? ? filters_clauses.join(' AND ') : nil
end
# Returns the issue count
if grouped?
begin
# Rails will raise an (unexpected) RecordNotFound if there's only a nil group value
- r = Issue.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
+ r = Issue.visible.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
rescue ActiveRecord::RecordNotFound
r = {nil => issue_count}
end
order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
order_option = nil if order_option.blank?
- Issue.find :all, :include => ([:status, :project] + (options[:include] || [])).uniq,
+ Issue.visible.find :all, :include => ([:status, :project] + (options[:include] || [])).uniq,
:conditions => Query.merge_conditions(statement, options[:conditions]),
:order => order_option,
:limit => options[:limit],
# Returns the journals
# Valid options are :order, :offset, :limit
def journals(options={})
- Journal.find :all, :include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
+ Journal.visible.find :all, :include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
:conditions => statement,
:order => options[:order],
:limit => options[:limit],
# Returns the versions
# Valid options are :conditions
def versions(options={})
- Version.find :all, :include => :project,
+ Version.visible.find :all, :include => :project,
:conditions => Query.merge_conditions(project_statement, options[:conditions])
rescue ::ActiveRecord::StatementInvalid => e
raise StatementInvalid.new(e.message)