Merge branch '105842700-registrants_portal' into staging

app/views/registrant/contacts/partials/_general.haml

@@ -31,13 +31,13 @@
       %dd
         = l(@contact.created_at, format: :short)
         by
-        = creator_link(@contact)
+        = @contact.name
 
       %dt= t(:updated)
       %dd
         = l(@contact.updated_at, format: :short)
         by
-        = updator_link(@contact)
+        = @contact.name
 
       %dt= t(:registrar)
       %dd

app/views/registrant/registrants/partials/_domains.haml

@@ -0,0 +1,30 @@
+- domains = contact.all_registrant_domains(page: params[:domain_page], per: 20, params: params, current_user: current_user)
+#contacts.panel.panel-default
+  .panel-heading
+    .pull-left
+      = t(:domains)
+    .pull-right
+      = form_tag request.path, method: :get do
+        = select_tag :domain_filter, options_for_select(%w(Registrant AdminDomainContact TechDomainContact), selected: params[:domain_filter]),
+            include_blank: true, class: 'form-control2 selectize2'
+        %button.btn.btn-primary
+          %span.glyphicon.glyphicon-search
+    .clearfix
+
+  .table-responsive
+    %table.table.table-hover.table-bordered.table-condensed
+      %thead
+        %tr
+          %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
+          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name
+          %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
+          %th{class: 'col-xs-3'}= t(:roles)
+      %tbody
+        - domains.each do |x|
+          %tr
+            %td= link_to(x.name, [:registrant, x])
+            %td= link_to(x.registrar, [:registrant, x.registrar])
+            %td= l(x.valid_to, format: :short)
+            %td= x.roles.join(", ")
+
+= paginate domains, param_name: :domain_page

app/views/registrant/registrants/partials/_statuses.haml

@@ -0,0 +1,21 @@
+- panel_class = contact.errors.messages[:statuses] ? 'panel-danger' : 'panel-default'
+#contact_statuses.panel{class: panel_class}
+  .panel-heading.clearfix
+    = t(:statuses)
+  .table-responsive
+    %table.table.table-hover.table-bordered.table-condensed
+      %thead
+        %tr
+          %th{class: 'col-xs-6'}= t(:status)
+          %th{class: 'col-xs-6'}= t(:notes)
+      %tbody
+        - contact.statuses.each do |status|
+          %tr
+            %td= status
+            %td= contact.status_notes[status]
+
+      - if contact.errors.messages[:statuses]
+        %tfoot
+          - @domain.errors.messages[:statuses].each do |s|
+            %tr
+              %td{colspan: 4}= s

app/views/registrant/registrants/show.haml

@@ -35,13 +35,13 @@
           %dd
             = l(@contact.created_at, format: :short)
             by
-            = creator_link(@contact)
+            = @contact.name
 
           %dt= t(:updated)
           %dd
             = l(@contact.updated_at, format: :short)
             by
-            = updator_link(@contact)
+            = @contact.name
 
           %dt= t(:registrar)
           %dd
@@ -72,4 +72,9 @@
           %dd= @contact.state
 
           %dt= t(:country)
-          %dd= @contact.country
+          %dd= @contact.country
+
+.row
+  .col-md-12= render 'registrant/registrants/partials/statuses', contact: @contact
+.row
+  .col-md-12= render 'registrant/registrants/partials/domains', contact: @contact