six-updater-web 0.15.3 → 0.15.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.15.3'
+  s.version = '0.15.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

@@ -10,7 +10,7 @@ class MainController < ApplicationController
     @autoskip = @system_setting.autoskip
     @autoskip = true if @autoskip.nil?
     @inweb = @system_setting.inweb
-    @queryserver = nil
+    @queryserver = Queryserver.new
 
     if @system_setting.synchronized_at
       ok = false if @system_setting.synchronized_at > 30.minutes.ago
@@ -140,7 +140,7 @@ class MainController < ApplicationController
     setting = fetch_param([:setting], Appsetting, setting)
     queryserver = fetch_param([:gamespy], Queryserver, queryserver)
     if queryserver
-      @queryserver = queryserver.id
+      @queryserver = queryserver
       server = queryserver.dynamic_server
     end
 
@@ -390,19 +390,43 @@ class MainController < ApplicationController
   private
   def act
     @preset = if @system_setting.favorite_preset
-      @system_setting.favorite_preset.to_s
+      begin
+        Sixconfig.find(@system_setting.favorite_preset.to_s)
+      rescue
+        Sixconfig.new
+      end
+    else
+      Sixconfig.new
     end
 
     @server = if @system_setting.favorite_server
-      @system_setting.favorite_server.to_s
+      begin
+        Server.find(@system_setting.favorite_server.to_s)
+      rescue
+        Server.new
+      end
+    else
+      Server.new
     end
 
     @action = if @system_setting.favorite_action
-      @system_setting.favorite_action.to_s
+      begin
+        Action.find(@system_setting.favorite_action.to_s)
+      rescue
+        Action.new
+      end
+    else
+      Action.new
     end
 
     @setting = if @system_setting.favorite_settings_profile
-      @system_setting.favorite_settings_profile.to_s
+      begin
+        Appsetting.find(@system_setting.favorite_settings_profile.to_s)
+      rescue
+        Appsetting.new
+      end
+    else
+      Appsetting.new
     end
   end
 

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

@@ -9,7 +9,7 @@
                 %label{ :for => "sixconfigs" }
                   = link_to "Preset", "/sixconfigs", :title => "Click to access Presets overview"
                  
-                = record_select_field 'config', @preset ? Sixconfig.find(@preset) : Sixconfig.new
+                = record_select_field 'config', @preset
                 = submit_tag "Edit"
                 = submit_tag "Sync", :name => "portalsync"
               %strong Optional Preset Overrides
@@ -17,19 +17,19 @@
                 %label{ :for => "actions" }
                   = link_to "Action", "/actions", :title => "Click to access Actions overview"
                    
-                = record_select_field 'act', @action ? Action.find(@action) : Action.new
+                = record_select_field 'act', @action
               %p
                 %label{ :for => "servers" }
                   = link_to "Server", "/queryservers", :title => "Click to access Gamespy browser overview"
                    
-                = record_select_field 'gamespy', @queryserver ? Queryserver.find(@queryserver) : Queryserver.new
+                = record_select_field 'gamespy', @queryserver
                 = submit_tag "Show"
                 = submit_tag "Sync", :name => "serversync"
               %p
                 %label{ :for => "settings" }
                   = link_to "Setting", "/appsettings", :title => "Click to access Settings Profiles overview" 
                    
-                = record_select_field 'setting', @setting ? Appsetting.find(@setting) : Appsetting.new
+                = record_select_field 'setting', @setting
               %p
                 = submit_tag "Execute"
                  
@@ -39,7 +39,7 @@
                 %a{:title => "Only update mods whos online version doesnt match local" }
                   Autoskip
                  
-                = check_box :system, :inweb, {:checked => @system_setting.inweb}
+                = check_box :system, :inweb, {:checked => @inweb}
                 %a{:title => "Display updater output into ajax-refreshed web-page (Handy for remote-management)" }
                   Integrated
               %p

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.15.3"
+  VERSION = "0.15.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
   - 15
-  - 3
-  version: 0.15.3
+  - 4
+  version: 0.15.4
 platform: ruby
 authors: 
 - Sickboy