diff --git a/app/models/rb_issue_history.rb b/app/models/rb_issue_history.rb index 3048fdbbb..ffe445d13 100644 --- a/app/models/rb_issue_history.rb +++ b/app/models/rb_issue_history.rb @@ -160,7 +160,7 @@ def self.rebuild_issue(issue, status=nil) } if ActiveRecord::Base.connection.tables.include?('rb_journals') - RbJournal.all(:conditions => ['issue_id=?', issue.id], :order => 'timestamp asc').each{|j| + RbJournal.where('issue_id=?', 601).order('timestamp asc').each{|j| date = j.timestamp.to_date full_journal[date] ||= {} case j.property diff --git a/app/views/rb_taskboards/show.html.erb b/app/views/rb_taskboards/show.html.erb index 84155b498..5207d566b 100644 --- a/app/views/rb_taskboards/show.html.erb +++ b/app/views/rb_taskboards/show.html.erb @@ -70,6 +70,7 @@ <%- content_for :main do %> <%= User.current.id %> +