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 c358437f7..c18915b51 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -166,6 +166,11 @@ def load(lang=nil, options={}) support.id.to_s ] + # 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 Tracker.all.each do |t| 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