From f435b1bd19a8d5e8bacbf669f54e0af0b279dd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20Keskk=C3=BCla?= Date: Mon, 22 Sep 2014 11:02:12 +0300 Subject: [PATCH] Contact searching --- app/models/contact.rb | 7 ++++++- app/views/admin/contacts/index.haml | 1 + app/views/admin/contacts/partials/_search.haml | 6 ++++++ config/locales/en.yml | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 app/views/admin/contacts/partials/_search.haml diff --git a/app/models/contact.rb b/app/models/contact.rb index 6626007b8..6ecac57e4 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -45,6 +45,9 @@ class Contact < ActiveRecord::Base CONTACT_TYPE_ADMIN = 'admin' CONTACT_TYPES = [CONTACT_TYPE_TECH, CONTACT_TYPE_ADMIN] + # TEMP Scope until confusion with contact name is sorted out + # scope :named, -> { joins(:international_address).uniq.all } + # TEMP METHOD for transaction to STI def address international_address @@ -86,7 +89,6 @@ class Contact < ActiveRecord::Base end # generate random id for contact - # def generate_code self.code = SecureRandom.hex(4) end @@ -131,6 +133,9 @@ class Contact < ActiveRecord::Base end class << self + # non-EPP + + # EPP def extract_attributes(ph, type = :create) contact_hash = { phone: ph[:voice], diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index c920d0bbe..07f3d2c38 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -1,6 +1,7 @@ .row .col-sm-6 %h2.text-center-xs= t('shared.contacts') + = render 'admin/contacts/partials/search' .col-sm-6 %h2.text-right.text-center-xs = link_to(t('shared.add'), new_admin_contact_path, class: 'btn btn-primary') diff --git a/app/views/admin/contacts/partials/_search.haml b/app/views/admin/contacts/partials/_search.haml new file mode 100644 index 000000000..645b568f0 --- /dev/null +++ b/app/views/admin/contacts/partials/_search.haml @@ -0,0 +1,6 @@ += search_form_for [:admin, @q] do |f| + = f.search_field :international_address_name_cont + = f.submit do + %span.glyphicon.glyphicon-search + + diff --git a/config/locales/en.yml b/config/locales/en.yml index b96b00921..e0eff11ec 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -265,3 +265,4 @@ en: edit_contact: 'Edit contact' failed_to_update_contact: 'Failed to update contact' contact_updated: 'Contact updated' + search: 'Search'