six-updater-web 0.19.0 → 0.19.1

data/Rakefile

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

@@ -229,9 +229,11 @@ class MainController < ApplicationController
     end
 
     if setting
-      setting.type = "Arma2Appsetting" if setting.type.nil? || setting.type.empty?
-      setting.save
-      setting = Arma2Appsetting.find(setting.id)
+      if setting.type.nil? || setting.type.empty? || setting.type == "Appsetting"
+        setting.type = "Arma2Appsetting"
+        setting.save
+        setting = Appsetting.find(setting.id)
+      end
     else
       setting = Arma2Appsetting.new
     end
@@ -406,10 +408,53 @@ class MainController < ApplicationController
 
   private
   def act(setting, preset, action, server)
+    @current_setting = setting ? setting : Arma2Appsetting.new
+
+    @preset = if @system_setting.favorite_preset
+     begin
+       Sixconfig.find(@system_setting.favorite_preset.to_s)
+     rescue
+       Sixconfig.new
+     end
+   else
+     Sixconfig.new
+   end
+
+   @server = if @system_setting.favorite_server
+     begin
+       Server.find(@system_setting.favorite_server.to_s)
+     rescue
+       Server.new
+     end
+   else
+     Server.new
+   end
+
+   @action = if @system_setting.favorite_action
+     begin
+       Action.find(@system_setting.favorite_action.to_s)
+     rescue
+       Action.new
+     end
+   else
+     Action.new
+   end
+
+   @setting = if @system_setting.favorite_settings_profile
+     begin
+       Appsetting.find(@system_setting.favorite_settings_profile.to_s)
+     rescue
+       Appsetting.new
+     end
+   else
+     Appsetting.new
+   end
+=begin
     @preset = preset ? preset : Sixconfig.new
     @server = server ? server : Queryserver.new
     @action = action ? action : Action.new
     @setting = setting ? setting : Arma2Appsetting.new
+=end
   end
 
   def fetch_param(ar, ty, default = nil)

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

@@ -19,4 +19,4 @@
         %td= link_to "Info", "http://updater.dev-heaven.net/mods/show/#{mod.id}", :target => "_blank"
         %td= link_to "Changelog", "http://updater.dev-heaven.net/mods/changelog/#{mod.id}", :target => "_blank"
         %td= mod.class.label
-        %td= mod.version_match?(@setting)
+        %td= mod.version_match?(@current_setting)

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

@@ -61,7 +61,7 @@
       %table{ :border => 1, :cellpadding => "5", :width => "100%"}
         %tr
           %td
-            Edition: #{link_to @setting.nice_found_type, nil, :title => "Supports mods for: #{@setting.found_types.map{|e| e.label}.join(", ")}" } Autoskip: #{@autoskip ? @autoskip : false}.
+            Edition: #{link_to @current_setting.nice_found_type, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" } Autoskip: #{@autoskip ? @autoskip : false}.
             Last sync
             - if @system_setting.synchronized_at
               = time_ago_in_words(@system_setting.synchronized_at)

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

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

data/lib/six-updater-web/vendor/plugins/six-import/lib/six/import.rb

@@ -58,11 +58,7 @@ module Six
         def blabla(h)
           l = []
           h.each_pair do |key, value|
-            case key
-              when self.to_s.downcase
-                c = self.from_hash value
-                l << c
-            end
+            l << self.from_hash(value.merge({:type => key.camelize.singularize}))
           end
           l
         end
@@ -95,11 +91,11 @@ module Six
         def from_hash( hash )
           h = hash.dup
           h.each do |key, value|
-            case value.class.to_s
-              when 'Array'
+            case value
+              when Array
                 h[key].map! { |e|
                   Object.const_get(key.camelize.singularize).from_hash e }
-              when 'Hash'
+              when Hash
                 h[key] = Object.const_get(key.camelize).from_hash value
             end
           end
@@ -124,7 +120,8 @@ module Six
           else
             n = self.new h
           end
-          logger.debug "#{n.class} #{n.id} #{n.changed?}: #{"#{n.inspect} - #{previous}" if n.changed?}"
+          n.type = h[:type] if h[:type] if n.respond_to?(:type)
+          logger.info "#{n.class} #{n.id} #{n.changed?}: #{"#{n.inspect} - #{previous}" if n.changed?}"
           n.save if n.changed?# || n.new?
           n
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 19
-  - 0
-  version: 0.19.0
+  - 1
+  version: 0.19.1
 platform: ruby
 authors: 
 - Sickboy