six-updater-web 0.21.3 → 0.21.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.21.3'
+  s.version = '0.21.4'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/controllers/main_controller.rb

@@ -150,8 +150,22 @@ class MainController < ApplicationController
     end
 
     if params[:system]
-      @beta = (params[:system][:beta] == "1")
-      @server_bool = (params[:system][:server_bool] == "1")
+      @beta = case params[:system][:beta]
+        when "default"
+          nil
+        when "true"
+          true
+        else
+          false         
+      end
+      @server_bool = case params[:system][:server_bool]
+        when "default"
+          nil
+        when "true"
+          true
+        else
+          false
+      end
       @autoskip = (params[:system][:autoskip] == "1")
       @inweb = (params[:system][:inweb] == "1")
     end
@@ -213,14 +227,14 @@ class MainController < ApplicationController
     end
 
     if setting
-      setting.beta = @beta
-      setting.server = @server_bool
+      setting.beta = @beta unless @beta.nil?
+      setting.server = @server_bool unless @server_bool.nil?
       @msg << "Override settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
     else
       if preset.appsetting
         setting = preset.appsetting
-        setting.beta = @beta
-        setting.server = @server_bool
+        setting.beta = @beta unless @beta.nil?
+        setting.server = @server_bool unless @server_bool.nil?
         @msg << "Preset settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
       end
     end

data/lib/six-updater-web/app/views/main/_left.haml

@@ -31,35 +31,34 @@
           = record_select_field 'setting', @setting, :controller => "Appsettings"
           = submit_tag "Edit setting"
         %p
-          = check_box :system, :beta, {:checked => @beta}
           %a{:title => "Enable beta mod and mode" }
             Beta
+          = select( "system", "beta", ["default", "true", "false"], {:selected => @beta.to_s})
            
-          = check_box :system, :server_bool, {:checked => @server_bool}
           %a{:title => "Enable (dedicated) server mode" }
             Server
-           
-          = check_box :system, :autoskip, {:checked => @autoskip}
+          = select( "system", "server_bool", ["default", "true", "false"], {:selected => @server_bool.to_s})
           %a{:title => "Only update mods whos online version doesnt match local" }
             Autoskip
+          = check_box :system, :autoskip, {:checked => @autoskip}
            
-          = check_box :system, :inweb, {:checked => @inweb}
           %a{:title => "Display updater output into ajax-refreshed web-page (Handy for remote-management)" }
-            Integrated
+            Remote
+          = check_box :system, :inweb, {:checked => @inweb}
         %p
           = submit_tag "Execute"
            
           = submit_tag "Save"
            
-          = submit_tag "Edit Userconfig"
-           
-          = submit_tag "Server Mod check"
-        %p
           = submit_tag "Stop Game"
            
           = submit_tag "Reset Skip Status"
-           
+        %p
           = submit_tag "Show status"
+           
+          = submit_tag "Server Mod check"
+           
+          = submit_tag "Edit Userconfig"
       %strong Logs
       - form_tag :action => :fetch do
         %p

data/lib/six-updater-web/app/views/main/_servercheck.haml

@@ -1,8 +1,11 @@
-Server: #{@queryserver.to_label}
+Server: #{link_to @queryserver.to_label, "/queryservers/edit/#{@queryserver.id}"}
 %br
 Signatures: #{@signatures}
 %br
 %br
+Mods: #{@queryserver.mod}
+%br
+%br
 Allowed:
 %br
 = @allowed

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.21.3"
+  VERSION = "0.21.4"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 21
-  - 3
-  version: 0.21.3
+  - 4
+  version: 0.21.4
 platform: ruby
 authors: 
 - Sickboy