Skip to content

O
OHR Support
Commit c58dc83e authored by Eric Davis's avatar Eric Davis
Browse files
Options

Refactor: Replace @journal with @issue.current_journal 

This removes an instance variable in #issue_update which will let it be moved
to the Issue model.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3540 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 7514e12d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
app/controllers/issues_controller.rb
View file @ c58dc83e
......@@ -188,6 +188,8 @@ class IssuesController < ApplicationController
def edit
update_issue_from_params
@journal = @issue.current_journal
respond_to do |format|
format.html { }
format.xml { }
......@@ -203,6 +205,7 @@ class IssuesController < ApplicationController
format.xml { head :ok }
end
else
@journal = @issue.current_journal
respond_to do |format|
format.html { render :action => 'edit' }
format.xml { render :xml => @issue.errors, :status => :unprocessable_entity }
......@@ -549,7 +552,7 @@ private
@time_entry = TimeEntry.new
@notes = params[:notes]
@journal = @issue.init_journal(User.current, @notes)
@issue.init_journal(User.current, @notes)
# User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
attrs = params[:issue].dup
......@@ -573,14 +576,14 @@ private
attachments = Attachment.attach_files(@issue, params[:attachments])
render_attachment_warning_if_needed(@issue)
attachments[:files].each {|a| @journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @journal})
attachments[:files].each {|a| @issue.current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @issue.current_journal})
if @issue.save
if !@journal.new_record?
if !@issue.current_journal.new_record?
# Only send notification if something was actually changed
flash[:notice] = l(:notice_successful_update)
end
call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @journal})
call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @issue.current_journal})
return true
end
end
......
app/models/issue.rb
View file @ c58dc83e
......@@ -47,6 +47,8 @@ class Issue < ActiveRecord::Base
:author_key => :author_id
DONE_RATIO_OPTIONS = %w(issue_field issue_status)
attr_reader :current_journal
validates_presence_of :subject, :priority, :project, :tracker, :author, :status
validates_length_of :subject, :maximum => 255
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment