Add simple delete link (without function)

redmine-patch-meetup · Nov 21, 2020 · d6f5a00 · d6f5a00
1 parent 3c2b6eb
commit d6f5a00
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
@@ -118,6 +118,7 @@ def show
       @content.current_version? &&
       Redmine::WikiFormatting.supports_section_edit?
 
+    @redirects_to_self = WikiRedirect.where(:redirects_to => @page.title, :redirects_to_wiki_id => @page.wiki_id)
     respond_to do |format|
       format.html
       format.api

diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
@@ -15,7 +15,9 @@
       <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
       <%= 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') %>
-      <%= link_to('Delete redirect from CookBook_documentation', {} , :class => 'icon icon-link-break') %>
+      <% @redirects_to_self.map { |redirect| %>
+        <%= link_to("Delete redirect from #{WikiPage.pretty_title(redirect.title)}", {} , :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 %>
       <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') %>

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
@@ -190,14 +190,19 @@ def test_show_delete_redirect_links
     @request.session[:user_id] = 2
 
     wiki_page = WikiPage.find_by(title: 'CookBook_documentation')
+    second_title = 'Old_Cookbook'
+    wiki_page.title = second_title
+    wiki_page.save
+
     new_title = 'New_Cookbook'
     wiki_page.title = new_title
     wiki_page.save
 
     get :show, :params => {:project_id => 1, :id => new_title}
 
     assert_select '.drdn-items' do
-      assert_select 'a.icon-link-break', text: 'Delete redirect from CookBook_documentation'
+      assert_select 'a.icon-link-break', text: 'Delete redirect from CookBook documentation'
+      assert_select 'a.icon-link-break', text: 'Delete redirect from Old Cookbook'
     end
   end