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/_admin_sidebar.html.haml
+++ b/app/views/layouts/_admin_sidebar.html.haml
@ -116,7 +116,11 @@
        - if can? :update, @conference.tickets.build
          %li{class: active_nav_li(admin_conference_tickets_path(@conference.short_title)) }
            = link_to 'Tickets', admin_conference_tickets_path(@conference.short_title)
-
+  - if can? :manage, @conference.booths.build
+    %li
+      = link_to  admin_conference_booths_path(@conference.short_title) do
+        %span.fa.fa-shopping-bag
+        Booths
  - if (can? :manage, @conference.targets.build) || (can? :manage, @conference.campaigns.build)
    %li
      %a