diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-10-22 17:38:05 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-10-22 17:38:05 +0000 |
| commit | d9652183f672a4f23fabb0b8921cb85773b25a54 (patch) | |
| tree | e449aedbbd852975fcbec2b56312e874e548c075 | |
| parent | 432b00df402c36b4fc2c27f5db1d0f8e23975ba9 (diff) | |
| download | redmine-d9652183f672a4f23fabb0b8921cb85773b25a54.tar.gz redmine-d9652183f672a4f23fabb0b8921cb85773b25a54.zip | |
Fixed: file upload on wiki page broken by recent refactoring (#6724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4274 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/wiki/show.rhtml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | test/integration/routing_test.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index 00feab8b9..f8675608e 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -35,7 +35,7 @@ <div id="wiki_add_attachment"> <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;", :id => 'attach_files_link' %></p> -<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> +<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> <div class="box"> <p><%= render :partial => 'attachments/form' %></p> </div> diff --git a/config/routes.rb b/config/routes.rb index 5676f4546..511e6dc29 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -41,7 +41,7 @@ ActionController::Routing::Routes.draw do |map| end wiki_routes.connect 'projects/:project_id/wiki/:page/:action', - :action => /rename|destroy|preview|protect/, + :action => /rename|destroy|preview|protect|add_attachment/, :conditions => {:method => :post} wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post} diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 084330c1c..ea8c71b0a 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -327,6 +327,7 @@ class RoutingTest < ActionController::IntegrationTest should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida' should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida' should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :page => 'ladida' + should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :page => 'ladida' end context "wikis (plural, admin setup)" do |