Merge branch 'master' into rebased_1530

2017-08-23 18:58:02 +00:00 · 2017-08-23 18:58:02 +00:00 · aebdd66034
commit aebdd66034
parent 2ff086ef0d 7af712f492
12 changed files with 90 additions and 24 deletions
--- a/app/views/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@ -16,6 +16,11 @@
    = link_to(conference_program_tracks_path(@conference.short_title)) do
      %span.fa.fa-road
      My Tracks
+-if @conference && @conference.program && (@conference.program.cfps.for_booths.try(:open?) || current_user.booths.where(conference_id: @conference.id).count > 0)
+  %li
+    = link_to (conference_booths_path(@conference.short_title)) do
+      %span.fa.fa-shopping-bag
+      My Booth Requests
 %li
  - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
    = link_to(destroy_user_ichain_session_path, method: 'delete') do