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/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@ -81,7 +81,7 @@
        %td
          %b Submitter
        %td
-          = link_to @event.submitter.public_name, admin_person_path(@event.submitter)
+          = link_to @event.submitter.name, admin_user_path(@event.submitter)
          (
          = link_to @event.submitter.email, "mailto: #{@event.submitter.email}"
          )