six-updater-web 0.21.4 → 0.21.5

data/Rakefile

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

data/lib/six-updater-web/app/models/appsetting.rb

@@ -102,7 +102,8 @@ class Appsetting < ActiveRecord::Base
 
   def real_params
     if self.params.nil?
-      self.detect_edition::DEFAULT_PARAMS
+      edition = self.detect_edition
+      edition ? edition::DEFAULT_PARAMS : nil
     else
       self.params
     end
@@ -209,7 +210,8 @@ class Appsetting < ActiveRecord::Base
   def detect_edition
     # TODO: Read the appsetting.exe to figure out an edition, as a static setting by the user?
     return self.class if self.class::SPECIFIC
-    return self.class unless self.real_path
+    return nil unless self.real_path
+    #return self.class unless self.real_path
     game = nil
     cond = nil
     ed = nil
@@ -275,16 +277,17 @@ class Appsetting < ActiveRecord::Base
     #Arma2StAppsetting
     # TODO: Add detection support based on user settings (exe/path)
     return self.class unless self.real_path
-    d = self.detect_edition
-    d ? d : self.class
+    self.detect_edition
   end
 
   def found_types
-    self.found_type.types
+    t = self.found_type
+    t ? t.types : []
   end
 
   def nice_found_type
-    self.found_type.label
+    t = self.found_type
+    t ? t.label : nil
   end
 
   def self.types

data/lib/six-updater-web/app/models/sixconfig.rb

@@ -19,10 +19,13 @@ class Sixconfig < ActiveRecord::Base
     m += srv.mods if srv
     self.mods.each { |mod| m << mod unless m.include?(mod) }
     if setting.beta
-      setting.found_type::DEFAULT_BETA_MODS.each do |mf|
-        mod = Mod.find_by_name(mf)
-        next unless mod
-        m << mod unless m.include?(mod)
+      t = setting.found_type
+      if t
+        t::DEFAULT_BETA_MODS.each do |mf|
+          mod = Mod.find_by_name(mf)
+          next unless mod
+          m << mod unless m.include?(mod)
+        end
       end
     end
     m.each {|mod| if (mod.new_record? && !mod.exists?(self.appsetting)); mod.disabled = true; end }

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

@@ -38,6 +38,7 @@
           %a{:title => "Enable (dedicated) server mode" }
             Server
           = 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}

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.21.4"
+  VERSION = "0.21.5"
   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
-  - 4
-  version: 0.21.4
+  - 5
+  version: 0.21.5
 platform: ruby
 authors: 
 - Sickboy