From 9f2c61004a650dfeacd8b9716c74c7d76a7917b9 Mon Sep 17 00:00:00 2001 From: Akihiro MATOBA Date: Sun, 16 Jan 2022 11:35:45 +0000 Subject: [PATCH 1/2] Setting.default_projects_public=0 --- lib/redmine/default_data/loader.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb index c358437f7..e1989acfa 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -166,6 +166,10 @@ def load(lang=nil, options={}) support.id.to_s ] + # set new project as private + # もし環境変数 が private だったら + Setting.default_projects_public = 0 + if workflow # Workflow Tracker.all.each do |t| From 3416ed0d064eb259fae1986bd5b86bd2945afbef Mon Sep 17 00:00:00 2001 From: Akihiro MATOBA Date: Sun, 16 Jan 2022 11:35:46 +0000 Subject: [PATCH 2/2] =?UTF-8?q?rake=E3=82=BF=E3=82=B9=E3=82=AF=E3=81=A8adm?= =?UTF-8?q?in=E7=94=BB=E9=9D=A2=E3=81=8B=E3=82=89=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 5 ++++- app/views/admin/_no_data.html.erb | 3 ++- lib/redmine/default_data/loader.rb | 7 ++++--- lib/tasks/load_default_data.rake | 5 ++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 40a04dcf7..b0fb994f9 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -55,8 +55,11 @@ def plugins # (roles, trackers, statuses, workflow, enumerations) def default_configuration if request.post? + options = {} + options[:default_projects_public] = params[:default_projects_public].presence || 'private' + begin - Redmine::DefaultData::Loader::load(params[:lang]) + Redmine::DefaultData::Loader::load(params[:lang], options) flash[:notice] = l(:notice_default_data_loaded) rescue => e flash[:error] = l(:error_can_t_load_default_data, ERB::Util.h(e.message)) diff --git a/app/views/admin/_no_data.html.erb b/app/views/admin/_no_data.html.erb index 8ad39b197..10aecdac8 100644 --- a/app/views/admin/_no_data.html.erb +++ b/app/views/admin/_no_data.html.erb @@ -2,7 +2,8 @@ <%= form_tag({:action => 'default_configuration'}) do %> <%= simple_format(l(:text_no_configuration_data)) %>

<%= l(:field_language) %>: - <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s) %> + <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s) %>
+
<%= submit_tag l(:text_load_default_configuration) %>

<% end %> diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb index e1989acfa..c18915b51 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -166,9 +166,10 @@ def load(lang=nil, options={}) support.id.to_s ] - # set new project as private - # もし環境変数 が private だったら - Setting.default_projects_public = 0 + # set new project as private if default_projects_public option is exist + if options[:default_projects_public] == 'private' + Setting.default_projects_public = 0 + end if workflow # Workflow diff --git a/lib/tasks/load_default_data.rake b/lib/tasks/load_default_data.rake index cc6774bce..8da15bebc 100644 --- a/lib/tasks/load_default_data.rake +++ b/lib/tasks/load_default_data.rake @@ -22,8 +22,11 @@ namespace :redmine do puts "====================================" end + options = {} + options[:default_projects_public] = ENV['REDMINE_DEFAULT_PROJECTS_PUBLIC'].presence + begin - Redmine::DefaultData::Loader.load(current_language) + Redmine::DefaultData::Loader.load(current_language, options) puts "Default configuration data loaded." rescue Redmine::DefaultData::DataAlreadyLoaded => error puts error.message