From a82f096fef5328c4fde55ae95b9d65d78d23850c Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 18 Apr 2016 15:32:14 +0300 Subject: [PATCH 1/3] 117226457-name_for_contacts --- app/views/registrar/domains/partials/_contacts.haml | 3 ++- app/views/registrar/domains/partials/_general.haml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/registrar/domains/partials/_contacts.haml b/app/views/registrar/domains/partials/_contacts.haml index 536f256b7..93058923c 100644 --- a/app/views/registrar/domains/partials/_contacts.haml +++ b/app/views/registrar/domains/partials/_contacts.haml @@ -9,7 +9,8 @@ %th{class: 'col-xs-8'}= t(:id) %tbody - @data.css('contact').each do |x| + - registrant = Contact.find_by_code(x.text) %tr %td= x['type'] %td= x.text - + %td= registrant.name \ No newline at end of file diff --git a/app/views/registrar/domains/partials/_general.haml b/app/views/registrar/domains/partials/_general.haml index 4eb5285e7..5381d0865 100644 --- a/app/views/registrar/domains/partials/_general.haml +++ b/app/views/registrar/domains/partials/_general.haml @@ -10,8 +10,9 @@ %dt= t(:registrar) %dd= @data.css('clID').text + - registrant = Contact.find_by_code(@data.css('registrant').text) %dt= t(:registrant) - %dd= @data.css('registrant').text + %dd= "#{registrant.name} (#{@data.css('registrant').text})" %dt= t(:registered) %dd= @data.css('crDate').text From 16641ce2c28eaf5dfdfcdbb43483b2851cb1cfd9 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 18 Apr 2016 15:40:29 +0300 Subject: [PATCH 2/3] 117226457-css_changes --- app/views/registrar/domains/partials/_contacts.haml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/registrar/domains/partials/_contacts.haml b/app/views/registrar/domains/partials/_contacts.haml index 93058923c..b94f99ee2 100644 --- a/app/views/registrar/domains/partials/_contacts.haml +++ b/app/views/registrar/domains/partials/_contacts.haml @@ -6,11 +6,12 @@ %thead %tr %th{class: 'col-xs-4'}= t(:type) - %th{class: 'col-xs-8'}= t(:id) + %th{class: 'col-xs-4'}= t(:name) + %th{class: 'col-xs-4'}= t(:id) %tbody - @data.css('contact').each do |x| - registrant = Contact.find_by_code(x.text) %tr %td= x['type'] - %td= x.text - %td= registrant.name \ No newline at end of file + %td= registrant.name + %td= x.text \ No newline at end of file From 21da9bbc9b2c6f1976c61647b35644225b2f4873 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 5 May 2016 20:06:11 +0300 Subject: [PATCH 3/3] 117226457-uuid --- app/api/repp/api.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/repp/api.rb b/app/api/repp/api.rb index 7a9ecd1e8..27d0322b0 100644 --- a/app/api/repp/api.rb +++ b/app/api/repp/api.rb @@ -49,7 +49,8 @@ module Repp response_code: status, api_user_name: current_user.try(:username), api_user_registrar: current_user.try(:registrar).try(:to_s), - ip: request.ip + ip: request.ip, + uuid: request.try(:uuid) }) end