From 449d5e6d34d24c77225fa6f2f70933eea4c11840 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Jul 2017 17:07:43 +0000
Subject: [PATCH] Removes the Modules tab in project settings (#26488).

Modules can now be select on the first tab, just like when creating a project.

git-svn-id: http://svn.redmine.org/redmine/trunk@16892 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb        |  6 ------
 app/helpers/projects_helper.rb                |  1 -
 app/views/projects/_form.html.erb             |  2 +-
 app/views/projects/settings/_modules.html.erb | 18 ------------------
 config/routes.rb                              |  1 -
 test/functional/projects_controller_test.rb   | 10 ++++++----
 6 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 app/views/projects/settings/_modules.html.erb

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3e3fc69f3..7219e4494 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -204,12 +204,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def modules
-    @project.enabled_module_names = params[:enabled_module_names]
-    flash[:notice] = l(:notice_successful_update)
-    redirect_to settings_project_path(@project, :tab => 'modules')
-  end
-
   def archive
     unless @project.archive
       flash[:error] = l(:error_can_not_archive_project)
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 7954937e0..6da3e5f4a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -20,7 +20,6 @@
 module ProjectsHelper
   def project_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
-            {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
             {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
             {: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]}},
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 0cbdf422e..1e8f40948 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -36,7 +36,7 @@
 <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
 </div>
 
-<% if @project.new_record? && @project.safe_attribute?('enabled_module_names') %>
+<% if @project.safe_attribute?('enabled_module_names') %>
 <fieldset class="box tabular"><legend><%= l(:label_module_plural) %></legend>
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
     <label class="floating">
diff --git a/app/views/projects/settings/_modules.html.erb b/app/views/projects/settings/_modules.html.erb
deleted file mode 100644
index c52741e5a..000000000
--- a/app/views/projects/settings/_modules.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<%= form_for @project,
-            :url => { :action => 'modules', :id => @project },
-            :html => {:id => 'modules-form',
-                      :method => :post} do |f| %>
-
-<fieldset class="box">
-<legend><%= l(:text_select_project_modules) %></legend>
-
-<% Redmine::AccessControl.available_project_modules.each do |m| %>
-<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m), :id => nil -%>
- <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
-<% end %>
-</fieldset>
-<p><%= check_all_links 'modules-form' %></p>
-
-<p><%= submit_tag l(:button_save) %></p>
-
-<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index a08ca1094..bbe824761 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -107,7 +107,6 @@ Rails.application.routes.draw do
 
     member do
       get 'settings(/:tab)', :action => 'settings', :as => 'settings'
-      post 'modules'
       post 'archive'
       post 'unarchive'
       post 'close'
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index f34627e5b..49c5ac54f 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -730,15 +730,17 @@ class ProjectsControllerTest < Redmine::ControllerTest
     assert_match /Successful update/, flash[:notice]
   end
 
-  def test_modules
+  def test_update_modules
     @request.session[:user_id] = 2
     Project.find(1).enabled_module_names = ['issue_tracking', 'news']
 
-    post :modules, :params => {
+    post :update, :params => {
         :id => 1,
-        :enabled_module_names => ['issue_tracking', 'repository', 'documents']
+        :project => {
+          :enabled_module_names => ['issue_tracking', 'repository', 'documents']
+        }
       }
-    assert_redirected_to '/projects/ecookbook/settings/modules'
+    assert_redirected_to '/projects/ecookbook/settings'
     assert_equal ['documents', 'issue_tracking', 'repository'], Project.find(1).enabled_module_names.sort
   end