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

Merge branch '111396946-blocked_and_reserved_view' into staging

Browse source
This commit is contained in:
Stas 2016-02-04 18:00:43 +02:00
commit dae85b3493
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -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

7
app/views/admin/blocked_domains/index.haml
View file

@ -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|
@ -52,8 +52,9 @@
%td= l(x.created_at, format: :short)
%td= l(x.updated_at, format: :short)
%td
= link_to(t(:delete), delete_admin_blocked_domain_path(id: x.id),
data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs')
%div{class: 'text-center'}
= link_to(t(:delete), delete_admin_blocked_domain_path(id: x.id),
data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs')
.row
.col-md-6
= paginate @domains