updated rails to 4.2.4

2015-09-17 12:12:51 +02:00 · 2015-09-17 12:12:51 +02:00 · 42e8bb11ea
commit 42e8bb11ea
parent 37697517df
55 changed files with 766 additions and 365 deletions
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@ -54,6 +54,14 @@
                    = javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
                  - else
                    = label_tag "label_rating", "", :class => "avgrating"
+                %br
+                - voted = event.voted?(event, current_user)
+                - if voted
+                  %span.label.label-success
+                    Your rating: #{voted.rating}
+                - else
+                  %span.label.label-danger
+                    Not rated
              - else
                0/#{@conference.call_for_paper.rating}
              %br