Merge pull request #1945 from dmitry-sinina/default_filter_by_date_fixes

fix default filter by date. refs #1630

Author: dmitry-sinina

app/admin/cdr/auth_logs.rb

@@ -7,8 +7,9 @@
   config.batch_actions = false
   config.sort_order = 'request_time_desc'
 
-  with_default_params do
-    params[:q] = { request_time_gteq_datetime_picker: 0.days.ago.beginning_of_day }
+  with_default_params if: proc { |q: nil, **_| q.blank? || q[:request_time_gteq_datetime_picker].blank? } do
+    params[:q] = params[:q]&.to_unsafe_h&.symbolize_keys || {}
+    params[:q][:request_time_gteq_datetime_picker] = 0.days.ago.beginning_of_day
     'Only records from beginning of the day showed by default'
   end
 

app/admin/cdr/cdrs.rb

@@ -10,8 +10,9 @@
 
   decorate_with CdrDecorator
 
-  with_default_params do
-    params[:q] = { time_start_gteq_datetime_picker: 0.days.ago.beginning_of_day }
+  with_default_params if: proc { |q: nil, **_| q.blank? || q[:time_start_gteq_datetime_picker].blank? } do
+    params[:q] = params[:q]&.to_unsafe_h&.symbolize_keys || {}
+    params[:q][:time_start_gteq_datetime_picker] = 0.days.ago.beginning_of_day
     'Only CDRs started from beginning of the day showed by default'
   end
 

app/admin/logs/api_logs.rb

@@ -9,8 +9,9 @@
   scope :all, default: true
   scope :failed, show_count: false
 
-  with_default_params do
-    params[:q] = { created_at_gteq_datetime_picker: 0.days.ago.beginning_of_day } # only 1 last days by default
+  with_default_params if: proc { |q: nil, **_| q.blank? || q[:created_at_gteq_datetime_picker].blank? } do
+    params[:q] = params[:q]&.to_unsafe_h&.symbolize_keys || {}
+    params[:q][:created_at_gteq_datetime_picker] = 0.days.ago.beginning_of_day
     'Only records from beginning of the day showed by default'
   end
 

app/admin/logs/audit_log_items.rb

@@ -14,8 +14,9 @@
   filter :ip
   filter :txid
 
-  with_default_params do
-    params[:q] = { created_at_gteq_datetime_picker: 0.days.ago.beginning_of_day } # only 1 last days by default
+  with_default_params if: proc { |q: nil, **_| q.blank? || q[:created_at_gteq_datetime_picker].blank? } do
+    params[:q] = params[:q]&.to_unsafe_h&.symbolize_keys || {}
+    params[:q][:created_at_gteq_datetime_picker] = 0.days.ago.beginning_of_day
     'Only records from beginning of the day showed by default'
   end
 

app/views/routing_simulation/_form.html.erb

@@ -1,7 +1,8 @@
 <%= semantic_form_for dc, :url => '/routing_simulation', :method => :get do |form| %>
     <%= form.semantic_errors *form.object.errors.attribute_names %>
     <%= form.inputs do %>
-        <%= form.input :auth_id, label:"Authorized gateway", collection: Gateway.where("incoming_auth_password is not null and allow_origination"), as: :select, include_blank: 'None', input_html: { class: 'tom-select' } %>
+        <% auth_gw_collection = form.object.auth_id ? Gateway.where(id: form.object.auth_id) : [] %>
+        <%= form.input :auth_id, label: "Authorized gateway", collection: auth_gw_collection, as: :select, include_blank: 'None', input_html: { class: 'tom-select-ajax', 'data-path': '/gateways/search?q[allow_origination_eq]=true&q[incoming_auth_password_not_null]=1' } %>
         <%= form.input :transport_protocol_id, collection: Equipment::TransportProtocol.all, as: :select, include_blank: false %>
         <%= form.input :interface, input_html: { value: form.object.interface || YetiConfig.routing_simulation_default_interface } %>
         <%= form.input :remote_ip %>