show_full_activity.diff

Brian Terlson, 2008-06-20 21:48

Download (1.01 KB)

View differences:

app/controllers/projects_controller.rb
258 258
      @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
259 259
      
260 260
      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
261
      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
261
      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
262 262
      @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
263 263
    end
264 264