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

Fix domain status history view

Browse source
This commit is contained in:
Sergei Tsõganov 2022-01-07 14:06:13 +02:00
parent 3debceac6e
commit 6d5be0f991
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,8 +63,11 @@ module Admin
# rubocop:enable Metrics/MethodLength # rubocop:enable Metrics/MethodLength
def versions def versions
per_page = 10
@domain = Domain.where(id: params[:domain_id]).includes({ versions: :item }).first @domain = Domain.where(id: params[:domain_id]).includes({ versions: :item }).first
@versions = @domain.versions @versions = @domain.versions
@last_version = @versions.last
@old_versions = Kaminari.paginate_array(@versions.not_creates.reverse).page(params[:page]).per(per_page)
end end
def keep def keep

14
app/views/admin/domains/versions.haml
View file

@ -25,17 +25,25 @@
domain: @pending_domain, pending_user: @pending_user, statuses_link: true domain: @pending_domain, pending_user: @pending_user, statuses_link: true
-# current version -# current version
- if @domain.versions.present? - if @versions.present?
- if params[:page].blank? || (params[:page].present? && params[:page].to_i < 2)
%tr.small %tr.small
= render 'admin/domains/partials/version', = render 'admin/domains/partials/version',
domain: @domain, version: @domain.versions.last domain: @domain, version: @last_version
-# all other older versions -# all other older versions
- @domain.versions.not_creates.reverse.each do |version| - @old_versions.each do |version|
%tr.small %tr.small
= render 'admin/domains/partials/version', = render 'admin/domains/partials/version',
domain: version.reify, version: version.previous domain: version.reify, version: version.previous
.row
.col-md-6
= paginate @old_versions
.col-md-6.text-right
.pagination
= t(:result_count, count: @old_versions.total_count + 1)
:javascript :javascript
window.addEventListener('load', function() { window.addEventListener('load', function() {
$(document).on('click', '.js-pending, .js-event', function(e) { $(document).on('click', '.js-pending, .js-event', function(e) {

5
config/locales/en.yml
View file

@ -622,7 +622,10 @@ en:
contact_ident: 'Contact ident' contact_ident: 'Contact ident'
results_per_page: 'Results per page' results_per_page: 'Results per page'
nameserver_hostname: 'Nameserver hostname' nameserver_hostname: 'Nameserver hostname'
result_count: '%{count} results' result_count:
zero: 'No results'
other: '%{count} results'
one: '1 result'
failed_to_generate_invoice_invoice_number_limit_reached: 'Failed to generate invoice - invoice number limit reached' failed_to_generate_invoice_invoice_number_limit_reached: 'Failed to generate invoice - invoice number limit reached'
is_too_small_minimum_deposit_is: 'is too small. Minimum deposit is %{amount} %{currency}' is_too_small_minimum_deposit_is: 'is too small. Minimum deposit is %{amount} %{currency}'
poll_pending_update_confirmed_by_registrant: 'Registrant confirmed domain update' poll_pending_update_confirmed_by_registrant: 'Registrant confirmed domain update'