Move route to /wikis/:wiki_page_id/redirects/:id

Author: rbtgr

app/controllers/wiki_redirects_controller.rb

@@ -20,6 +20,11 @@
 class WikiRedirectsController < ApplicationController
   before_action :find_wiki_redirect
 
+  # /projects/{project_id}/wikis/redirects/{id}
+  # /projects/project-a/wikis/redirects/222
+
+  # TODO?
+  # /projects/{project_id}/wikis/{page}/redirects/{id}
   def destroy
     @wiki_redirect.destroy
   end

app/views/wiki/show.html.erb

@@ -16,7 +16,7 @@
       <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
       <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') %>
       <% @redirects_to_self.map { |redirect| %>
-        <%= link_to("Delete redirect from #{WikiPage.pretty_title(redirect.title)}", project_redirect_path(@project, redirect), :class => 'icon icon-link-break') %>
+        <%= link_to("Delete redirect from #{WikiPage.pretty_title(redirect.title)}", {:controller => 'wiki_redirects', :action => 'destroy', :project_id => @project.id, :wiki_page_id => @page.title, :id => redirect.id}, :method => :delete, :class => 'icon icon-link-break') %>
       <% } %>
       <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del') %>
     <% else %>

config/routes.rb

@@ -182,6 +182,7 @@
 
     match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
     resources :wiki, :except => [:index, :create], :as => 'wiki_page' do
+      resources :redirects, controller: 'wiki_redirects', only: :destroy
       member do
         get 'rename'
         post 'rename'
@@ -197,7 +198,6 @@
         get 'date_index'
         post 'new'
         # TODO: Move to member
-        resources :redirects, controller: 'wiki_redirects', only: :destroy
       end
     end
     match 'wiki', :controller => 'wiki', :action => 'show', :via => :get

test/functional/wiki_redirects_controller_test.rb

@@ -34,7 +34,7 @@ def test_destroy
 
     wiki_redirect = WikiRedirect.create!(wiki_id: 1, title: 'Test', redirects_to: wiki_page.title, redirects_to_wiki_id: 1)
 
-    delete :destroy, params: { id: wiki_redirect.id, project_id: wiki_page.wiki.project_id }
+    delete :destroy, params: { id: wiki_redirect.id, project_id: wiki_page.wiki.project_id, wiki_page_id: wiki_page.id }
 
     # WikiRedirectが消えていること
     assert_not WikiRedirect.where(id: wiki_redirect.id).exists?