From 2553bd4e035845337a3c68afafc2c8fc01cd6236 Mon Sep 17 00:00:00 2001
From: Ancor Gonzalez Sosa <ancor@suse.de>
Date: Tue, 16 Jul 2013 16:15:17 +0200
Subject: [PATCH] Fixes in registration#show after merging

---
 app/views/admin/registrations/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/registrations/show.html.haml b/app/views/admin/registrations/show.html.haml
index 6c921f6c..675b8360 100644
--- a/app/views/admin/registrations/show.html.haml
+++ b/app/views/admin/registrations/show.html.haml
@@ -29,7 +29,7 @@
           - @headers.each do |field|
             %td
               - if field == "name"
-                #{registration.last_name} #{registration.first_name} (#{registration.nickname}) #{registration.affiliation}
+                #{registration.last_name} #{registration.first_name} (#{registration.irc_nickname}) #{registration.company}
                 - if registration.supporter_level && registration.supporter_level.title != 'Free'
                   %p{:style => "color:red"}
                     = registration.supporter_level.title