six-updater-web 0.18.0 → 0.18.1

data/Rakefile

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

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

@@ -15,9 +15,4 @@ class ActionsController < ApplicationController
     config.action_links.add 'copy', :label => 'Clone', :type => :record, :position => false, :confirm => "Do you really want to *clone* this item?"
   end
   
-  def copy
-    t = copy_ll(Action)
-    @original_record = t[0]
-    @record = t[1]
-  end
 end

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

@@ -32,9 +32,4 @@ class AppsettingsController < ApplicationController
       @processes = []
     end
   end
-  def copy
-    t = copy_ll(Appsetting)
-    @original_record = t[0]
-    @record = t[1]
-  end
 end

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

@@ -8,7 +8,7 @@ class QueryserversController < ApplicationController
     config.columns = [:name, :ip, :port, :numplayers, :ping, :country, :gametype, :mission, :mapname, :mods, :saved_password, :updated_at,
                       :password, :sv_battleye, :verifysignatures, :dedicated, :favorite, :difficulty, :gamestate, :gamemode,
                       :language, :gamever, :platform, :exec2, :mod, :signatures, :players]
-    config.list.columns.exclude :saved_password, :ip, :port, :gamestate, :language, :difficulty, :gamever, :gamemode, :mapname, :platform,
+    config.list.columns.exclude :saved_password, :ip, :port, :gamestate, :language, :difficulty, :gamemode, :mapname, :platform,
                                 :sv_battleye, :players, :signatures, :mod
     config.show.columns.exclude :mission # :players # Encoding problem when both are displayed, with russian text?
     config.update.columns.exclude :exec2

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

@@ -30,4 +30,10 @@ class SixconfigsController < ApplicationController
       config.columns[column].inplace_edit = true
     end
   end
+
+  def copy
+    t = copy_ll(Kernel.const_get(self.controller_name.singularize.camelize), [:mods])
+    @original_record = t[0]
+    @record = t[1]
+  end
 end

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

@@ -15,6 +15,10 @@ class Queryserver < ActiveRecord::Base
     [self.ip, self.port].join(":")
   end
 
+  def to_label
+    "#{self.name} (v#{self.gamever})"
+  end
+
   def mods_fetch
     if self.mod.size > 0
       self.mod.reject {|m| SYS_MODS.include? m }.map do |m|

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.18.0"
+  VERSION = "0.18.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

@@ -9,12 +9,6 @@ module Six
 
       module ClassMethods
         public
-        def copy
-          t = copy_ll(Kernel.const_get(self.controller_name.singularize.camelize))
-          @original_record = t[0]
-          @record = t[1]
-        end
-
         def six_local_auto_login
           if request.remote_ip == "127.0.0.1" && defined?(SixUpdaterWeb::SIX_ADMIN)
             if SixUpdaterWeb::SIX_ADMIN
@@ -25,6 +19,12 @@ module Six
           end
         end
 
+        def copy
+          t = copy_ll(Kernel.const_get(self.controller_name.singularize.camelize))
+          @original_record = t[0]
+          @record = t[1]
+        end
+
         private
         def copy_ll(cl, include = [])
           record = cl.find(params[:id])
@@ -35,6 +35,14 @@ module Six
           end
           #new_record.id = nil
           new_record.updated_at = nil
+          # TODO: only each if plural... or class == AR Association
+          include.each do |i|
+            n = new_record.send i
+            o = record.send i
+            o.each do |m|
+              n << m
+            end
+          end
           new_record.save
           [record, new_record]
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 18
-  - 0
-  version: 0.18.0
+  - 1
+  version: 0.18.1
 platform: ruby
 authors: 
 - Sickboy