jro_apps/redmine Commit - r3426:c58dc83e74f2

Refactor: Replace @journal with @issue.current_journal...

Eric Davis -

r3426:c58dc83e74f2

parent child

Context file:

r3426:c58dc83e74f2

Collapse all files

app/controllers/issues_controller.rb +8 -5

               def edit
                 update_issue_from_params
+                @journal = @issue.current_journal
                 respond_to do |format|
                   format.html { }
                   format.xml  { }
                     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 }
                 @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
                   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)}
+                  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 => @journal})
+                  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 +2 0

                                         :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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages