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/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@ -57,15 +57,15 @@
        .col-md-8
          %h3
            by
-            = @speaker.public_name
+            = @speaker.name
            (
            = @speaker.email
            )
-            - if @speaker.company?
+            - if @speaker.affiliation?
              %br
              %span.muted
                from
-                = @speaker.company
+                = @speaker.affiliation
          -if @speaker.biography?
            = simple_format(@speaker.biography)
        .col-md-4