Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn

app/models/user_certification.rb

@@ -5,4 +5,8 @@ class UserCertification < ActiveRecord::Base
 
   belongs_to :user
   belongs_to :certification
+
+  def user_name
+    self.user.name unless self.user.blank?
+  end
 end

app/views/user_certifications/index.html.erb

@@ -5,9 +5,9 @@
   <% @grouped_user_certs.sort.each do |cert, user_certifications| %>
   <dl class="collapsible">
     <dt><%= cert.name %></dt>
-    <% user_certifications.sort{|a,b| a.user.name <=> b.user.name}.each do |user_certification| %>
+    <% user_certifications.sort{|a,b| a.user_name <=> b.user_name}.each do |user_certification| %>
       <dd>
-        <%= link_to user_certification.user.name, user_certification %>
+        <%= link_to user_certification.user_name, user_certification %>
       </dd>
     <% end %>
   </dl>