Merge 521d2dc72f into b64cc9f7e4

2014-03-17 15:35:34 +00:00 · 2014-03-17 15:35:34 +00:00 · 1421241df5
commit 1421241df5
parent b64cc9f7e4 521d2dc72f
8 changed files with 30 additions and 23 deletions
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@ -13,7 +13,7 @@
            %b ID
          %th
            %b Title
-          - if @conference.call_for_papers.rating != 0
+          - if !@conference.call_for_papers.blank? && @conference.call_for_papers.rating != 0
            %th
              %b Rating
          %th