init journal will return the last_journal, not the new one, now

68ca0636 · Tim Felgentreff · 0b852af6 · 68ca0636 · 68ca0636
Commit 68ca0636 authored Sep 14, 2010 by Tim Felgentreff
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

changeset.rb app/models/changeset.rb +1 -1

mail_handler.rb app/models/mail_handler.rb +2 -2

No files found.
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -110,7 +110,7 @@ class Changeset < ActiveRecord::Base
          if self.scmid && (! (csettext =~ /^r[0-9]+$/))
            csettext = "commit:\"#{self.scmid}\""
          end
-          journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
+          issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
          issue.status = fix_status
          unless Setting.commit_fix_done_ratio.blank?
            issue.done_ratio = Setting.commit_fix_done_ratio.to_i

--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -179,7 +179,7 @@ class MailHandler < ActionMailer::Base
    end

    # add the note
-    journal = issue.init_journal(user, cleaned_up_text_body)
+    issue.init_journal(user, cleaned_up_text_body)
    add_attachments(issue)
    # check workflow
    if status && issue.new_statuses_allowed_to(user).include?(status)
@@ -191,7 +191,7 @@ class MailHandler < ActionMailer::Base

    issue.save!
    logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
-    journal
+    issue.last_journal
  end

  # Reply will be added to the issue