Fix config file saving

Comment AAS-TestMap so that it's not selected as part of Random startup maps
Joe-Klauza · Feb 19, 2023 · 54b3b26 · 54b3b26
1 parent 618b2e7
commit 54b3b26
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/admin-interface/docroot/views/server-config.erb b/admin-interface/docroot/views/server-config.erb
@@ -356,7 +356,7 @@
             <textarea id="admins-cfg" class="m-2 config-file" file="admins_cfg"><%= @admins_cfg %></textarea>
           </div>
           <div class="tab-pane fade horizontal-expand" id="mapcycle-cfg-tab">
-            <textarea id="mapcycle-cfg" class="m-2 config-file" file="map_cycle_cfg"><%= @mapcycle_cfg %></textarea>
+            <textarea id="mapcycle-cfg" class="m-2 config-file" file="mapcycle_cfg"><%= @mapcycle_cfg %></textarea>
           </div>
           <div class="tab-pane fade horizontal-expand" id="bans-cfg-tab">
             <textarea id="bans-cfg" class="m-2 config-file" file="bans_cfg"><%= @bans_cfg %></textarea>

diff --git a/admin-interface/lib/config-handler.rb b/admin-interface/lib/config-handler.rb
@@ -87,8 +87,8 @@
   'Montecassino' => ' Monte Cassino',
   'LamDong' => 'Lam Dong',
   'Khafji_P' => 'Khafji_P',
-  'Risala' => 'Risala',
-  'AAS-TestMap' => 'Test Map (AAS)'
+  'Risala' => 'Risala'
+  # 'AAS-TestMap' => 'Test Map (AAS)'
   # 'SaintQuentin' => 'Saint Quentin',
   # 'OmahaBeach' => 'OmahaBeach',
   # 'Carentan' => 'Carentan',

diff --git a/admin-interface/lib/webapp.rb b/admin-interface/lib/webapp.rb
@@ -979,7 +979,7 @@ def redirect_to_config(config_id, path)
     config = get_config(params['config-id'])
     file_type = params['file']
     halt(400, "File type not found: #{file_type}") unless CONFIG_FILES[file_type.to_sym]
-    file = ERB.new(CONFIG_FILES[:bans_cfg][:local_erb]).result(binding)
+    file = ERB.new(CONFIG_FILES[file_type.to_sym][:local_erb]).result(binding)
     halt(400, "File not found: #{file.sub(USER_HOME, '~')}") unless File.exist? file
     File.read(file)
   end
@@ -989,7 +989,7 @@ def redirect_to_config(config_id, path)
     config = get_config(config_id)
     file_type = params['file']
     halt(400, "File type not found: #{file_type}") unless CONFIG_FILES[file_type.to_sym]
-    file = ERB.new(CONFIG_FILES[:bans_cfg][:local_erb]).result(binding)
+    file = ERB.new(CONFIG_FILES[file_type.to_sym][:local_erb]).result(binding)
     content = params['content']
     content << "\n" unless content.end_with? "\n"
     FileUtils.mkdir_p(File.dirname(file))