Merge branch 'release/0.6.15.5'

ulmic · Apr 24, 2016 · 4b5c48a · 4b5c48a
2 parents 6620639 + ac704f9
commit 4b5c48a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/decorators/logged_action_decorator.rb b/app/decorators/logged_action_decorator.rb
@@ -2,7 +2,7 @@ class LoggedActionDecorator < ApplicationDecorator
   delegate_all
 
   def name
-    "#{object.user.decorate.short_name} #{object.record.decorate.name}"
+    "#{object.user.decorate.short_name} #{object.record.decorate.name}" if object
   end
 
   def user_short_name