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

diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 00feab8b96f01a8b0fa7b5636ae35e97e7da3a9e..f8675608e41ad900ab81d99d5133a86825f98f94 100644 (file)
--- 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 5676f4546ba56dc6145d44730dfdaa9de9643628..511e6dc29d556027914b38ea464cf410d5e66ca4 100644 (file)
--- 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 084330c1c1d114f4f72b95820a11494219ea69f7..ea8c71b0af2143d594407fbb5400009a45568ab5 100644 (file)
--- 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