jro_apps/redmine Commit - r14480:5ef6f243b135

Merged r14856 (#21155)....

Jean-Philippe Lang -

r14480:5ef6f243b135

parent child

Context file:

r14480:5ef6f243b135

app/controllers/wiki_controller.rb +6 -3

                def destroy_version
                  return render_403 unless editable?
-                 @content = @page.content_for_version(params[:version])
-                 @content.destroy
-                 redirect_to_referer_or history_project_wiki_page_path(@project, @page.title)
+                 if content = @page.content.versions.find_by_version(params[:version])
+                   content.destroy
+                   redirect_to_referer_or history_project_wiki_page_path(@project, @page.title)
+                 else
+                   render_404
+                 end
                end
                # Export wiki to a single pdf or html file

test/functional/wiki_controller_test.rb +12 0

                  end
                end
+               def test_destroy_invalid_version_should_respond_with_404
+                 @request.session[:user_id] = 2
+                 assert_no_difference 'WikiContent::Version.count' do
+                   assert_no_difference 'WikiContent.count' do
+                     assert_no_difference 'WikiPage.count' do
+                       delete :destroy_version, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => 99
+                     end
+                   end
+                 end
+                 assert_response 404
+               end
                def test_index
                  get :index, :project_id => 'ecookbook'
                  assert_response :success

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages