Mercurial > hg > soundsoftware-site
comparison app/controllers/journals_controller.rb @ 1298:4f746d8966dd redmine_2.3_integration
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:28:30 +0100 |
parents | 622f24f53b42 |
children | e248c7af89ec |
comparison
equal
deleted
inserted
replaced
1297:0a574315af3e | 1298:4f746d8966dd |
---|---|
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 { |