User/Person models merge

2014-06-23 19:07:50 +03:00 · 2014-06-23 19:07:50 +03:00 · 23bf55b66c
commit 23bf55b66c
parent 66b84e3660
80 changed files with 1064 additions and 1221 deletions
--- a/app/views/admin/events/show.html.haml
+++ b/app/views/admin/events/show.html.haml
@ -24,7 +24,7 @@
            %tr
              %td
                - if !version.whodunnit.nil?
-                  = Person.find_person_by_user_id(version.whodunnit).public_name
+                  = User.find(version.whodunnit).name
                - else
                  No user (probably via the console)
              %td