zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 13:15:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2166 from internetee/2165-ransack-fix

Browse source 
Fix ransack gem association response
This commit is contained in:
Timo Võhmar 2021-10-06 19:26:10 +03:00 • committed by GitHub
commit f097de4a63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -19,7 +19,7 @@ gem 'figaro', '~> 1.2'
gem 'paper_trail', '~> 12.1' gem 'paper_trail', '~> 12.1'
gem 'pg', '1.2.3' gem 'pg', '1.2.3'
# 1.8 is for Rails < 5.0 # 1.8 is for Rails < 5.0
gem 'ransack', '~> 2.3' gem 'ransack', '~> 2.4.2'
gem 'truemail', '~> 2.4' # validates email by regexp, mail server existence and address existence gem 'truemail', '~> 2.4' # validates email by regexp, mail server existence and address existence
gem 'validates_email_format_of', '1.6.3' # validates email against RFC 2822 and RFC 3696 gem 'validates_email_format_of', '1.6.3' # validates email against RFC 2822 and RFC 3696

4
Gemfile.lock
View file

@ -560,7 +560,7 @@ DEPENDENCIES
que que
que-web que-web
rails (~> 6.1.4) rails (~> 6.1.4)
ransack (~> 2.3) ransack (~> 2.4.2)
rest-client rest-client
rexml rexml
sass-rails sass-rails
@ -579,4 +579,4 @@ DEPENDENCIES
wkhtmltopdf-binary (~> 0.12.5.1) wkhtmltopdf-binary (~> 0.12.5.1)
BUNDLED WITH BUNDLED WITH
2.2.26 2.2.27

6
app/controllers/admin/invoices_controller.rb
View file

@ -93,12 +93,12 @@ module Admin
def filter_by_receipt_date(invoices) def filter_by_receipt_date(invoices)
date_from_param = params[:q][:receipt_date_gteq] if params[:q][:receipt_date_gteq].present? date_from_param = params[:q][:receipt_date_gteq] if params[:q][:receipt_date_gteq].present?
date_from = date_from_param ? Time.zone.parse(date_from_param) : -Float::INFINITY date_from = date_from_param ? Time.zone.parse(date_from_param) : nil
date_until_param = params[:q][:receipt_date_lteq] if params[:q][:receipt_date_lteq].present? date_until_param = params[:q][:receipt_date_lteq] if params[:q][:receipt_date_lteq].present?
date_until = date_until_param ? Time.zone.parse(date_from_param) : Float::INFINITY date_until = date_until_param ? Time.zone.parse(date_until_param) : nil
invoices.where(account_activity: { created_at: date_from..date_until }) invoices.where(account_activities: { created_at: date_from..date_until })
end end
end end
end end