zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-11 23:24:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2151 from internetee/fix-for-ransack-deprecated-method

Browse source 
Fixes for ransack gem
This commit is contained in:
Timo Võhmar 2021-09-14 14:39:30 +03:00 • committed by GitHub
commit c3dbeaa5a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/account_activities_controller.rb
View file

@ -18,8 +18,8 @@ module Admin
balance_params.delete('created_at_gteq')
end
@q = AccountActivity.includes(:invoice, account: :registrar).search(params[:q])
@b = AccountActivity.search(balance_params)
@q = AccountActivity.includes(:invoice, account: :registrar).ransack(params[:q])
@b = AccountActivity.ransack(balance_params)
@q.sorts = 'id desc' if @q.sorts.empty?
@account_activities = @q.result.page(params[:page]).per(params[:results_per_page])

2
app/controllers/admin/accounts_controller.rb
View file

@ -3,7 +3,7 @@ module Admin
load_and_authorize_resource
def index
@q = Account.includes(:registrar).search(params[:q])
@q = Account.includes(:registrar).ransack(params[:q])
@accounts = @q.result.page(params[:page])
@accounts = @accounts.per(params[:results_per_page]) if paginate?

2
app/controllers/admin/admin_users_controller.rb
View file

@ -4,7 +4,7 @@ module Admin
before_action :set_user, only: [:show, :edit, :update, :destroy]
def index
@q = AdminUser.search(params[:q])
@q = AdminUser.ransack(params[:q])
@admin_users = @q.result.page(params[:page]).order(:username)
@count = @q.result.count
@admin_users = @admin_users.per(params[:results_per_page]) if paginate?

2
app/controllers/admin/api_users_controller.rb
View file

@ -3,7 +3,7 @@ module Admin
load_and_authorize_resource
def index
@q = ApiUser.includes(:registrar).search(params[:q])
@q = ApiUser.includes(:registrar).ransack(params[:q])
@api_users = @q.result.page(params[:page])
@api_users = @api_users.per(params[:results_per_page]) if paginate?
end

4
app/controllers/admin/bank_statements_controller.rb
View file

@ -5,14 +5,14 @@ module Admin
before_action :set_bank_statement, only: %i[show bind_invoices]
def index
@q = BankStatement.search(params[:q])
@q = BankStatement.ransack(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty?
@bank_statements = @q.result.page(params[:page])
@bank_statements = @bank_statements.per(params[:results_per_page]) if paginate?
end
def show
@q = @bank_statement.bank_transactions.includes(:account_activity).search(params[:q])
@q = @bank_statement.bank_transactions.includes(:account_activity).ransack(params[:q])
@q.sorts = 'account_activity_id desc' if @q.sorts.empty?
@bank_transactions = @q.result.page(params[:page])
end

2
app/controllers/admin/billing/prices_controller.rb
View file

@ -25,7 +25,7 @@ module Admin
prices = ::Billing::Price.send(@search.status)
end
@q = prices.search(params[:q])
@q = prices.ransack(params[:q])
@q.sorts = ['zone_id asc', 'duration asc', 'operation_category asc',
'valid_from desc', 'valid_to asc'] if @q.sorts.empty?
@prices = @q.result.page(params[:page])

2
app/controllers/admin/blocked_domains_controller.rb
View file

@ -5,7 +5,7 @@ module Admin
def index
params[:q] ||= {}
domains = BlockedDomain.all.order(:name)
@q = domains.search(params[:q])
@q = domains.ransack(params[:q])
@domains = @q.result.page(params[:page])
@domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?

2
app/controllers/admin/bounced_mail_addresses_controller.rb
View file

@ -5,7 +5,7 @@ module Admin
# GET /bounced_mail_addresses
def index
@q = BouncedMailAddress.all.order(created_at: :desc).search(params[:q])
@q = BouncedMailAddress.all.order(created_at: :desc).ransack(params[:q])
@bounced_mail_addresses = @q.result.page(params[:page]).per(params[:results_per_page])
@count = @q.result.count
end

5
app/controllers/admin/contact_versions_controller.rb
View file

@ -7,7 +7,7 @@ module Admin
def index
params[:q] ||= {}
@q = Version::ContactVersion.search(params[:q])
@q = Version::ContactVersion.ransack(params[:q])
@versions = @q.result.page(params[:page])
search_params = params[:q].deep_dup
@ -25,7 +25,8 @@ module Admin
end
versions = Version::ContactVersion.includes(:item).where(where_s).order(created_at: :desc, id: :desc)
@q = versions.search(params[:q])
@q = versions.ransack(params[:q])
@versions = @q.result.page(params[:page])
@versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?

2
app/controllers/admin/contacts_controller.rb
View file

@ -20,7 +20,7 @@ module Admin
contacts = filter_by_flags(contacts)
normalize_search_parameters do
@q = contacts.search(search_params)
@q = contacts.ransack(search_params)
@contacts = @q.result.distinct.page(params[:page])
end

2
app/controllers/admin/dns/zones_controller.rb
View file

@ -5,7 +5,7 @@ module Admin
before_action :load_zone, only: %i[edit update destroy]
def index
@q = ::DNS::Zone.search(params[:q])
@q = ::DNS::Zone.ransack(params[:q])
@count = @q.result.count
@zones = @q.result.page(params[:page]).per(params[:results_per_page])
end

5
app/controllers/admin/domain_versions_controller.rb
View file

@ -7,7 +7,7 @@ module Admin
def index
params[:q] ||= {}
@q = Version::DomainVersion.includes(:item).search(params[:q])
@q = Version::DomainVersion.includes(:item).ransack(params[:q])
@versions = @q.result.page(params[:page])
search_params = params[:q].deep_dup
@ -46,7 +46,8 @@ module Admin
where_s += " AND 1=0" if registrars == []
versions = Version::DomainVersion.includes(:item).where(where_s).order(created_at: :desc, id: :desc)
@q = versions.search(params[:q])
@q = versions.ransack(params[:q])
@versions = @q.result.page(params[:page])
@versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?

4
app/controllers/admin/domains_controller.rb
View file

@ -14,14 +14,14 @@ module Admin
end
normalize_search_parameters do
@q = domains.search(params[:q])
@q = domains.ransack(params[:q])
@domains = @q.result.page(params[:page])
(redirect_to [:admin, @domains.first] and return if @domains.count == 1 && params[:q][:name_matches].present?)
if @domains.count.zero? && params[:q][:name_matches] !~ /^%.+%$/
# if we do not get any results, add wildcards to the name field and search again
n_cache = params[:q][:name_matches]
params[:q][:name_matches] = "%#{params[:q][:name_matches]}%"
@q = domains.search(params[:q])
@q = domains.ransack(params[:q])
@domains = @q.result.page(params[:page])
params[:q][:name_matches] = n_cache # we don't want to show wildcards in search form
end

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

@ -36,7 +36,7 @@ module Admin
invoices = filter_by_status
invoices = filter_by_receipt_date(invoices)
@q = invoices.search(params[:q])
@q = invoices.ransack(params[:q])
@q.sorts = 'number desc' if @q.sorts.empty?
@invoices = @q.result.page(params[:page])
@invoices = @invoices.per(params[:results_per_page]) if paginate?

2
app/controllers/admin/repp_logs_controller.rb
View file

@ -5,7 +5,7 @@ module Admin
# rubocop:disable Metrics/MethodLength
def index
@q = ApiLog::ReppLog.search(params[:q])
@q = ApiLog::ReppLog.ransack(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty?
@repp_logs = @q.result

2
app/controllers/admin/reserved_domains_controller.rb
View file

@ -6,7 +6,7 @@ module Admin
def index
params[:q] ||= {}
domains = ReservedDomain.all.order(:name)
@q = domains.search(params[:q])
@q = domains.ransack(params[:q])
@domains = @q.result.page(params[:page])
@domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?

2
app/controllers/registrar/account_activities_controller.rb
View file

@ -14,7 +14,7 @@ class Registrar
logger.warn('Invalid date')
end
@q = account.activities.includes(:invoice).search(params[:q])
@q = account.activities.includes(:invoice).ransack(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty?
respond_to do |format|

2
app/controllers/registrar/contacts_controller.rb
View file

@ -28,7 +28,7 @@ class Registrar
end
normalize_search_parameters do
@q = contacts.search(search_params)
@q = contacts.ransack(search_params)
end
contacts = @q.result

4
app/controllers/registrar/domains_controller.rb
View file

@ -24,14 +24,14 @@ class Registrar
domains = domains.where(contacts: { ident: params[:contacts_ident_eq] }) if params[:contacts_ident_eq]
normalize_search_parameters do
@q = domains.search(search_params.except(:contacts_ident_eq))
@q = domains.ransack(search_params.except(:contacts_ident_eq))
@domains = @q.result.page(params[:page])
# if we do not get any results, add wildcards to the name field and search again
if @domains.count == 0 && search_params[:name_matches] !~ /^%.+%$/
new_search_params = search_params.to_h.except(:contacts_ident_eq)
new_search_params[:name_matches] = "%#{new_search_params[:name_matches]}%"
@q = domains.search(new_search_params)
@q = domains.ransack(new_search_params)
@domains = @q.result.page(params[:page])
end
end

2
app/controllers/registrar/invoices_controller.rb
View file

@ -7,7 +7,7 @@ class Registrar
invoices = current_registrar_user.registrar.invoices.includes(:items, :account_activity)
normalize_search_parameters do
@q = invoices.search(params[:q])
@q = invoices.ransack(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty?
@invoices = @q.result.page(params[:page])
end

2
app/views/admin/domains/index.html.erb
View file

@ -22,7 +22,7 @@
</thead>
<tbody>
<%= render @domains %>
<%= render partial: 'domain', collection: @domains %>
</tbody>
</table>
</div>

2
app/views/registrar/domains/index.html.erb
View file

@ -39,7 +39,7 @@
</thead>
<tbody>
<%= render @domains %>
<%= render partial: 'domain', collection: @domains %>
</tbody>
</table>
</div>