diff --git a/app/controllers/admin/blocked_domains_controller.rb b/app/controllers/admin/blocked_domains_controller.rb index a21e01fd1..49cc65675 100644 --- a/app/controllers/admin/blocked_domains_controller.rb +++ b/app/controllers/admin/blocked_domains_controller.rb @@ -4,7 +4,7 @@ class Admin::BlockedDomainsController < AdminController def index params[:q] ||= {} - domains = BlockedDomain.all + domains = BlockedDomain.all.order(:name) @q = domains.search(params[:q]) @domains = @q.result.page(params[:page]) @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 diff --git a/app/controllers/admin/reserved_domains_controller.rb b/app/controllers/admin/reserved_domains_controller.rb index 319a6275c..7de8d9891 100644 --- a/app/controllers/admin/reserved_domains_controller.rb +++ b/app/controllers/admin/reserved_domains_controller.rb @@ -5,7 +5,7 @@ class Admin::ReservedDomainsController < AdminController def index params[:q] ||= {} - domains = ReservedDomain.all + domains = ReservedDomain.all.order(:name) @q = domains.search(params[:q]) @domains = @q.result.page(params[:page]) @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 diff --git a/app/views/admin/blocked_domains/index.haml b/app/views/admin/blocked_domains/index.haml index 5accae030..ab5f79bc7 100644 --- a/app/views/admin/blocked_domains/index.haml +++ b/app/views/admin/blocked_domains/index.haml @@ -43,7 +43,7 @@ = sort_link(@q, 'created_at', t(:created_at)) %th{class: 'col-xs-2'} = sort_link(@q, 'updated_at', t(:updated_at)) - %th{class: 'col-xs-2'} + %th{class: 'col-xs-1'} = t(:actions) %tbody - @domains.each do |x| @@ -51,9 +51,9 @@ %td= x.name %td= l(x.created_at, format: :short) %td= l(x.updated_at, format: :short) - %td + %td{class: 'col-xs-1'} = link_to(t(:delete), delete_admin_blocked_domain_path(id: x.id), - data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs') + data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs center-block') .row .col-md-6 = paginate @domains