##// END OF EJS Templates
scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465)...
scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465) Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be , following error raises. <pre> Traceback (most recent call last): File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module> mercurial.dispatch.run() File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run sys.exit(dispatch(sys.argv[1:])) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch return _runcatch(u, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch return _dispatch(ui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch cmd, func, args, options, cmdoptions = _parse(lui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse args = fancyopts.fancyopts(args, c, cmdoptions, True) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts for short, name, default, comment in options: ValueError: too many values to unpack 1) Error: test_nodes_in_branch(MercurialAdapterTest): Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1 lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg' lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch' </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7640 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r6778:892b4bafd3d2
r7520:a6d3409a5a0c
Show More
comments_controller.rb
36 lines | 1.1 KiB | text/x-ruby | RubyLexer
class CommentsController < ApplicationController
default_search_scope :news
model_object News
before_filter :find_model_object
before_filter :find_project_from_association
before_filter :authorize
verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
def create
@comment = Comment.new(params[:comment])
@comment.author = User.current
if @news.comments << @comment
flash[:notice] = l(:label_comment_added)
end
redirect_to :controller => 'news', :action => 'show', :id => @news
end
verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
def destroy
@news.comments.find(params[:comment_id]).destroy
redirect_to :controller => 'news', :action => 'show', :id => @news
end
private
# ApplicationController's find_model_object sets it based on the controller
# name so it needs to be overriden and set to @news instead
def find_model_object
super
@news = @object
@comment = nil
@news
end
end