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/conference/_recent_submissions.html.haml
+++ b/app/views/admin/conference/_recent_submissions.html.haml
@ -12,11 +12,11 @@
          %tbody
            %tr
              %td #{index + 1}
-              %td #{event.submitter}
+              %td #{event.submitter.name}
              %td #{event.title}
              %td #{event.conference.title}
              %td
                .span{'class'=>label_for(event.state)} #{event.state.humanize}
 - else
  %h5.text-warning.text-center
-    No submissions!
+    No submissions!