diff options
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 1 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 15 |
3 files changed, 0 insertions, 17 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6d944aa12..820aa6c81 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -177,7 +177,6 @@ class ProjectsController < ApplicationController @version_status = params[:version_status] || 'open' @version_name = params[:version_name] @versions = @project.shared_versions.status(@version_status).like(@version_name) - @wiki ||= @project.wiki || Wiki.new(:project => @project) end def edit diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 819547abd..794546163 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -25,7 +25,6 @@ module ProjectsHelper {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural, :url => {:tab => 'versions', :version_status => params[:version_status], :version_name => params[:version_name]}}, {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural}, - {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki}, {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural}, {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}, {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :label_time_tracking} diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index ebc159c1f..658efcc24 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -592,21 +592,6 @@ class ProjectsControllerTest < Redmine::ControllerTest assert_response 403 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, :params => { - :id => 1 - } - assert_response :success - - assert_select 'form[action=?]', '/projects/ecookbook/wiki' do - assert_select 'input[name=?]', 'wiki[start_page]' - end - end - def test_settings_should_accept_version_status_filter @request.session[:user_id] = 2 |