Mercurial > hg > soundsoftware-site

comparison app/controllers/comments_controller.rb @ 1298:4f746d8966dd redmine_2.3_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
30 @comment.author = User.current 30 @comment.author = User.current
31 if @news.comments << @comment 31 if @news.comments << @comment
32 flash[:notice] = l(:label_comment_added) 32 flash[:notice] = l(:label_comment_added)
33 end 33 end
34 34
35 redirect_to :controller => 'news', :action => 'show', :id => @news 35 redirect_to news_path(@news)
36 end 36 end
37 37
38 def destroy 38 def destroy
39 @news.comments.find(params[:comment_id]).destroy 39 @news.comments.find(params[:comment_id]).destroy
40 redirect_to :controller => 'news', :action => 'show', :id => @news 40 redirect_to news_path(@news)
41 end 41 end
42 42
43 private 43 private
44 44
45 # ApplicationController's find_model_object sets it based on the controller 45 # ApplicationController's find_model_object sets it based on the controller