meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Error raised on project settings after project wiki is deleted (#18429).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13660 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-11-28 07:43:22 +00:00
parent 6671a0c505
commit 552926772a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View File

@ -162,7 +162,7 @@ class ProjectsController < ApplicationController
@issue_category ||= IssueCategory.new
@member ||= @project.members.new
@trackers = Tracker.sorted.to_a
@wiki ||= @project.wiki
@wiki ||= @project.wiki || Wiki.new(:project => @project)
end
def edit

14
test/functional/projects_controller_test.rb
View File

@ -408,6 +408,20 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response 302
end
def test_setting_with_wiki_module_and_no_wiki
Project.find(1).wiki.destroy
Role.find(1).add_permission! :manage_wiki
@request.session[:user_id] = 2
get :settings, :id => 1
assert_response :success
assert_template 'settings'
assert_select 'form[action=?]', '/projects/ecookbook/wiki' do
assert_select 'input[name=?]', 'wiki[start_page]'
end
end
def test_update
@request.session[:user_id] = 2 # manager
post :update, :id => 1, :project => {:name => 'Test changed name',