rakeタスクとadmin画面から指定できるようにした

redmine-patch-meetup · Nov 24, 2022 · 9f02c1a · 9f02c1a
1 parent 4885089
commit 9f02c1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -2,7 +2,8 @@
 <%= form_tag({:action => 'default_configuration'}) do %>
     <%= simple_format(l(:text_no_configuration_data)) %>
     <p><%= 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) %><br/>
+    <label class="inline"><%= check_box_tag :default_projects_public, 'public', true %> <%= l(:setting_default_projects_public) %></label><br/>
     <%= submit_tag l(:text_load_default_configuration) %></p>
 <% end %>
 </div>
diff --git 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
@@ -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