From 58e383bd25b8c1e512ddef8bc2a5870e27bdadca Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Thu, 17 Mar 2016 13:59:42 +0200 Subject: [PATCH 1/3] Story#112601637 - admin contacts has filter to get only ident_country_code --- app/controllers/admin/contacts_controller.rb | 2 ++ app/views/admin/contacts/index.haml | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb index 960d74002..3a05bb759 100644 --- a/app/controllers/admin/contacts_controller.rb +++ b/app/controllers/admin/contacts_controller.rb @@ -20,6 +20,8 @@ class Admin::ContactsController < AdminController else contacts = Contact.includes(:registrar) end + contacts = contacts.where("ident_country_code is null or ident_country_code=''") if params[:only_no_country_code].eql?('1') + normalize_search_parameters do @q = contacts.search(search_params) diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index 715b87eb6..566ce05db 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -59,7 +59,12 @@ .form-group = label_tag t(:results_per_page) = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) - .col-md-3{style: 'padding-top: 25px;'} + .col-md-3 + .form-group + = label_tag "Only wout ident CC?" + = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), class: 'form-control' + .row + .col-md-3{style: 'padding-top: 25px;float:right;'} %button.btn.btn-primary   %span.glyphicon.glyphicon-search From 320e8ac6e40f89d56579712198040896ac25a729 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Thu, 17 Mar 2016 14:30:00 +0200 Subject: [PATCH 2/3] Story#112601637 - admin contacts has filter to get only ident_country_code --- app/views/admin/contacts/index.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index 566ce05db..8c57b6433 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -61,7 +61,7 @@ = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) .col-md-3 .form-group - = label_tag "Only wout ident CC?" + = label_tag "Ident CC missing?" = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), class: 'form-control' .row .col-md-3{style: 'padding-top: 25px;float:right;'} From b4911911e2d059b111b01a3518400691fa94159d Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Fri, 18 Mar 2016 16:10:02 +0200 Subject: [PATCH 3/3] Story#112601637 - update ident cc missing filter name --- app/views/admin/contacts/index.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index 8c57b6433..14bd3ae06 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -61,8 +61,9 @@ = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) .col-md-3 .form-group - = label_tag "Ident CC missing?" - = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), class: 'form-control' + = label_tag :only_no_country_code, "Ident CC missing" + = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), style: 'width:auto;height:auto;float:right' + .row .col-md-3{style: 'padding-top: 25px;float:right;'} %button.btn.btn-primary