Merge pull request #1834 from bear454/fix-speaker-registration-issues

Fix speaker registration issues
2017-12-13 10:15:36 +01:00 · 2017-12-13 10:15:36 +01:00 · 952e8ac316
commit 952e8ac316
parent ac8b187f1f 710010cb76
6 changed files with 37 additions and 16 deletions
--- a/app/views/physical_tickets/show.html.haml
+++ b/app/views/physical_tickets/show.html.haml
@ -31,12 +31,7 @@
        = @user.email
    .col-md-5.col-md-offset-2.box.well
      - if @conference.picture?
-        - width = @conference.picture.image[:width]
-        - height = @conference.picture.image[:height]
-        - if 10 * width > 15 * height
-          = image_tag(@conference.picture_url, width: '150')
-        - else
-          = image_tag(@conference.picture_url, height: '100')
+        = image_tag(@conference.picture.ticket.url, class: 'img-responsive')
      - else
        = image_tag('/img/osem-logo.png', class: 'img-responsive')
      %p.text-left