From 922e94649d8db375677f53cde404e5969f24e425 Mon Sep 17 00:00:00 2001
From: Ana <anamma06@gmail.com>
Date: Thu, 10 Mar 2016 22:49:54 +0100
Subject: [PATCH] overriding the #name attribute

---
 app/models/user.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 5a14e885..d548853e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,6 +53,10 @@ class User < ActiveRecord::Base
             },
             presence: true
 
+  def name
+    self[:name] || username
+  end
+
   def subscribed? conference
     self.subscriptions.find_by(conference_id: conference.id).present?
   end