Skip to content

Commit cfbed0b

Browse files
kfischer-okarinRedmine Patch Meetup
authored andcommitted
Redirect to Wiki page + show success message
1 parent 548e85e commit cfbed0b

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

app/controllers/wiki_redirects_controller.rb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,18 @@ class WikiRedirectsController < ApplicationController
2121
before_action :find_wiki_redirect, :authorize
2222

2323
def destroy
24-
@wiki_redirect.destroy
24+
if @wiki_redirect.destroy
25+
flash[:notice] = l(:notice_successful_delete)
26+
redirect_to project_wiki_page_path(@page.project, @page.title)
27+
end
2528
end
2629

2730
private
2831

2932
def find_wiki_redirect
3033
@project = Project.find(params[:project_id])
31-
page = Wiki.find_page(params[:wiki_page_id], project: @project)
32-
@wiki_redirect= WikiRedirect.where(redirects_to: page.title).find(params[:id])
34+
@page = Wiki.find_page(params[:wiki_page_id], project: @project)
35+
@wiki_redirect=WikiRedirect.where(redirects_to: @page.title).find(params[:id])
3336
render_404 unless @wiki_redirect
3437
rescue ActiveRecord::RecordNotFound
3538
render_404

test/functional/wiki_redirects_controller_test.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ def test_destroy
4040

4141
delete :destroy, params: {id: wiki_redirect.id, project_id: wiki_page.wiki.project_id, wiki_page_id: 'Test'}
4242

43-
assert_response :success
43+
assert_redirected_to '/projects/ecookbook/wiki/Test'
44+
assert_equal 'Successful deletion.', flash[:notice]
4445
assert_not WikiRedirect.exists?(id: wiki_redirect.id)
4546
end
4647

0 commit comments

Comments
 (0)