Merge pull request #720 from dmitry-sinina/1.10.12

1.10.12
yeti-switch · May 24, 2020 · d60a96b · d60a96b
2 parents 5bb50bd + ebdd932
commit d60a96b
Show file tree

Hide file tree

Showing 82 changed files with 4,290 additions and 177 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -87,25 +87,25 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.2)
-      actionpack (= 5.2.4.2)
+    actioncable (5.2.4.3)
+      actionpack (= 5.2.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
+    actionmailer (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.2)
-      actionview (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionpack (5.2.4.3)
+      actionview (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionview (5.2.4.3)
+      activesupport (= 5.2.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -134,32 +134,32 @@ GEM
       ransack (>= 1.8.7)
       sass (~> 3.1)
       sprockets (< 4.1)
-    activejob (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activejob (5.2.4.3)
+      activesupport (= 5.2.4.3)
       globalid (>= 0.3.6)
     activeldap (5.1.1)
       activemodel (> 4.0.0)
       builder
       gettext
       gettext_i18n_rails
       locale
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       arel (>= 9.0)
     activerecord-import (1.0.4)
       activerecord (>= 3.2)
-    activestorage (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
+    activestorage (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -339,10 +339,10 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.4)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     msgpack (1.2.6)
     multi_json (1.13.1)
     multipart-post (2.1.1)
@@ -368,7 +368,7 @@ GEM
       prometheus_exporter
     powerpack (0.1.2)
     public_suffix (3.0.3)
-    puma (4.3.3)
+    puma (4.3.5)
       nio4r (~> 2.0)
     puma_worker_killer (0.1.1)
       get_process_mem (~> 0.2)
@@ -378,27 +378,27 @@ GEM
     rack (2.1.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.2)
-      actioncable (= 5.2.4.2)
-      actionmailer (= 5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      activestorage (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    rails (5.2.4.3)
+      actioncable (= 5.2.4.3)
+      actionmailer (= 5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
+      activestorage (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.2)
+      railties (= 5.2.4.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    railties (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -522,7 +522,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     xdan-datetimepicker-rails (2.5.4)

diff --git a/app/admin/cdr/cdrs.rb b/app/admin/cdr/cdrs.rb
@@ -10,7 +10,7 @@
 
   decorate_with CdrDecorator
 
-  before_action do
+  before_action only: [:index] do
     if params['q'].blank?
       from_date = 0.days.ago.beginning_of_day
       params['q'] = { time_start_gteq: from_date } # only 1 last days by default

diff --git a/app/admin/import/codec_group_codecs.rb b/app/admin/import/codec_group_codecs.rb
@@ -3,6 +3,7 @@
 ActiveAdmin.register Importing::CodecGroupCodec do
   filter :codec_group, input_html: { class: 'chosen' }
   filter :codec
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -18,6 +19,7 @@ def scoped_collection
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :codec_group, sortable: :codec_group_name do |row|
       if row.codec_group.blank?
         row.codec_group_name

diff --git a/app/admin/import/codec_groups.rb b/app/admin/import/codec_groups.rb
@@ -2,6 +2,7 @@
 
 ActiveAdmin.register Importing::CodecGroup do
   filter :name
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -11,6 +12,7 @@
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
   end
 end
diff --git a/app/admin/import/import_accounts.rb b/app/admin/import/import_accounts.rb
@@ -4,6 +4,7 @@
   filter :contractor, input_html: { class: 'chosen' }
   filter :name
   filter :balance
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -25,6 +26,7 @@ def scoped_collection
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :contractor, sortable: :contractor_name do |row|
       if row.contractor.blank?
         row.contractor_name

diff --git a/app/admin/import/import_contractors.rb b/app/admin/import/import_contractors.rb
@@ -2,9 +2,10 @@
 
 ActiveAdmin.register Importing::Contractor do
   filter :name
-  filter :enabled, as: :select, collection: [['Yes', true], ['No', false]]
-  filter :vendor, as: :select, collection: [['Yes', true], ['No', false]]
-  filter :customer, as: :select, collection: [['Yes', true], ['No', false]]
+  boolean_filter :enabled
+  boolean_filter :vendor
+  boolean_filter :customer
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -22,6 +23,7 @@ def resource_params
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
     column :enabled
     column :vendor

diff --git a/app/admin/import/import_customers_auths.rb b/app/admin/import/import_customers_auths.rb
@@ -6,6 +6,7 @@
   filter :routing_plan_name
   filter :gateway_name
   filter :account_name
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -27,6 +28,7 @@ def scoped_collection
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
     column :enabled
     column :reject_calls

diff --git a/app/admin/import/import_destinations.rb b/app/admin/import/import_destinations.rb
@@ -5,6 +5,7 @@
   filter :prefix
   filter :rate
   filter :connect_fee
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -24,6 +25,7 @@ def resource_params
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :enabled
     column :prefix
     column :reject_calls

diff --git a/app/admin/import/import_dialpeers.rb b/app/admin/import/import_dialpeers.rb
@@ -3,12 +3,13 @@
 ActiveAdmin.register Importing::Dialpeer, as: 'Dialpeer Imports' do
   filter :o_id
   filter :prefix
-  filter :enabled, as: :select, collection: [['Yes', true], ['No', false]]
+  boolean_filter :enabled
   filter :vendor, input_html: { class: 'chosen' }
   filter :account, input_html: { class: 'chosen' }
   filter :gateway, input_html: { class: 'chosen' }
   filter :routing_group, input_html: { class: 'chosen' }
   filter :routeset_discriminator, input_html: { class: 'chosen' }
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -30,6 +31,7 @@ def scoped_collection
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :prefix
     column :enabled
     column :priority

diff --git a/app/admin/import/import_disconnect_policies.rb b/app/admin/import/import_disconnect_policies.rb
@@ -3,6 +3,7 @@
 ActiveAdmin.register Importing::DisconnectPolicy do
   filter :o_id
   filter :name
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -20,6 +21,7 @@ def resource_params
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
   end
 end
diff --git a/app/admin/import/import_gateway.rb b/app/admin/import/import_gateway.rb
@@ -4,6 +4,7 @@
   filter :name
   filter :contractor, input_html: { class: 'chosen' }
   filter :gateway_group, input_html: { class: 'chosen' }
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -26,6 +27,7 @@ def resource_params
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
     column :enabled
 

diff --git a/app/admin/import/import_gateway_groups.rb b/app/admin/import/import_gateway_groups.rb
@@ -4,6 +4,7 @@
   filter :name
   filter :vendor, input_html: { class: 'chosen' }
   filter :balancing_mode, as: :select
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -25,6 +26,7 @@ def scoped_collection
     id_column
     column :error_string
     column :o_id
+    column :is_changed
 
     column :vendor, sortable: :vendor_name do |row|
       if row.vendor.blank?

diff --git a/app/admin/import/import_numberlist_items.rb b/app/admin/import/import_numberlist_items.rb
@@ -4,6 +4,7 @@
   filter :key
   filter :numberlist, input_html: { class: 'chosen' }
   filter :action
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -24,6 +25,7 @@ def resource_params
 
     column :error_string
     column :o_id
+    column :is_changed
 
     column :numberlist
     column :key

diff --git a/app/admin/import/import_numberlists.rb b/app/admin/import/import_numberlists.rb
@@ -4,6 +4,7 @@
   filter :name
   filter :mode
   filter :default_action
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -24,6 +25,7 @@ def resource_params
 
     column :error_string
     column :o_id
+    column :is_changed
 
     column :name
     column :mode

diff --git a/app/admin/import/import_rateplans.rb b/app/admin/import/import_rateplans.rb
@@ -3,6 +3,7 @@
 ActiveAdmin.register Importing::Rateplan, as: 'Rateplan Imports' do
   filter :o_id
   filter :name
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -20,6 +21,7 @@ def resource_params
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
   end
 end
diff --git a/app/admin/import/import_registrations.rb b/app/admin/import/import_registrations.rb
@@ -6,6 +6,7 @@
   filter :routing_group_name
   filter :gateway_name
   filter :account_name
+  boolean_filter :is_changed
 
   acts_as_import_preview
 
@@ -25,6 +26,7 @@ def resource_params
     id_column
     column :error_string
     column :o_id
+    column :is_changed
     column :name
     column :enabled