comparison app/controllers/journals_controller.rb @ 1464:261b3d9a4903 redmine-2.4

Update to Redmine 2.4 branch rev 12663
author Chris Cannam
date Tue, 14 Jan 2014 14:37:42 +0000
parents 433d4f72a19b
children e248c7af89ec
comparison
equal deleted inserted replaced
1296:038ba2d95de8 1464:261b3d9a4903
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
78 if request.post? 78 if request.post?
79 @journal.update_attributes(:notes => params[:notes]) if params[:notes] 79 @journal.update_attributes(:notes => params[:notes]) if params[:notes]
80 @journal.destroy if @journal.details.empty? && @journal.notes.blank? 80 @journal.destroy if @journal.details.empty? && @journal.notes.blank?
81 call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params}) 81 call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
82 respond_to do |format| 82 respond_to do |format|
83 format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id } 83 format.html { redirect_to issue_path(@journal.journalized) }
84 format.js { render :action => 'update' } 84 format.js { render :action => 'update' }
85 end 85 end
86 else 86 else
87 respond_to do |format| 87 respond_to do |format|
88 format.html { 88 format.html {