six-updater-web 0.24.2 → 0.24.3

data/Rakefile

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

@@ -189,28 +189,6 @@ class MainController < ApplicationController
       @system_setting.save
     end
 
-    case params["commit"].downcase
-      when "edit preset"
-        redirect_to "/sixconfigs/edit/#{preset.id}"
-        return
-
-      when "edit server"
-        redirect_to "/queryservers/edit/#{queryserver.id}"
-        return
-
-      when "edit action"
-        redirect_to "/actions/edit/#{action.id}"
-        return
-
-      when "edit setting"
-        redirect_to "/appsettings/edit/#{setting.id}"
-        return
-
-      when "edit userconfig"
-        redirect_to "/config/?setting=#{setting.id}"
-        return
-    end
-
     if preset
       @status << "Preset: <a href='/sixconfigs/edit/#{preset.id}' title='#{preset.mods.map{|e| e.name}.join(", ")}'>#{preset.name}</a>"
     else
@@ -274,6 +252,28 @@ class MainController < ApplicationController
       end
     end
 
+    case params["commit"].downcase
+      when "edit preset"
+        redirect_to "/sixconfigs/edit/#{preset.id}"
+        return
+
+      when "edit server"
+        redirect_to "/queryservers/edit/#{queryserver.id}"
+        return
+
+      when "edit action"
+        redirect_to "/actions/edit/#{action.id}"
+        return
+
+      when "edit setting"
+        redirect_to "/appsettings/edit/#{setting.id}"
+        return
+
+      when "edit userconfig"
+        redirect_to "/config/?setting=#{setting.id}"
+        return
+    end
+
     @msg << "Skip status reset!" if reset
 
     # Check for open processes

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

@@ -28,7 +28,7 @@ class Sixconfig < ActiveRecord::Base
         end
       end
     end
-    m.each {|mod| if (mod.new_record? && !mod.exists?(self.appsetting)); mod.disabled = true; end }
+    m.each {|mod| if (mod.new_record? && !mod.exists?(setting)); mod.disabled = true; end }
     ms = []
     m.each {|mod| ms += mod.all_dependentmods; ms << mod } 
     ms.uniq.reject{|e| e.class == Mod} # Shitty workaround for crap input (Wrong type mods...)

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

@@ -23,7 +23,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.24.2"
+  VERSION = "0.24.3"
   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
   - 24
-  - 2
-  version: 0.24.2
+  - 3
+  version: 0.24.3
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 +02:00
+date: 2010-08-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency