Code cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10179 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 21:28:07 +00:00
parent b907398788
commit 0ce0b52342
3 changed files with 19 additions and 6 deletions
@@ -172,12 +172,7 @@ class IssuesController < ApplicationController
    rescue ActiveRecord::StaleObjectError
      @conflict = true
      if params[:last_journal_id]
-        if params[:last_journal_id].present?
-          last_journal_id = params[:last_journal_id].to_i
-          @conflict_journals = @issue.journals.all(:conditions => ["#{Journal.table_name}.id > ?", last_journal_id])
-        else
-          @conflict_journals = @issue.journals.all
-        end
+        @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
      end
    end