From 834e9d96e4ac60a3c28455722d05ad2c6f2f6fda Mon Sep 17 00:00:00 2001 From: nasia Date: Fri, 11 Aug 2017 15:14:22 +0300 Subject: [PATCH] Add booths to admin sidebar --- app/controllers/admin/booths_controller.rb | 4 ++++ app/views/admin/booths/_change_state_dropdown.html.haml | 5 +++++ app/views/layouts/_admin_sidebar.html.haml | 6 +++++- config/routes.rb | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/booths_controller.rb b/app/controllers/admin/booths_controller.rb index a200e42e..a65de090 100644 --- a/app/controllers/admin/booths_controller.rb +++ b/app/controllers/admin/booths_controller.rb @@ -90,6 +90,10 @@ module Admin update_state(:cancel, 'Booth is canceled') end + def confirm + update_state(:confirm, 'Booth successfully confirmed') + end + private def update_state(transition, notice) diff --git a/app/views/admin/booths/_change_state_dropdown.html.haml b/app/views/admin/booths/_change_state_dropdown.html.haml index 12b982df..338e43f7 100644 --- a/app/views/admin/booths/_change_state_dropdown.html.haml +++ b/app/views/admin/booths/_change_state_dropdown.html.haml @@ -42,3 +42,8 @@ %li= link_to 'Cancel booth', cancel_admin_conference_booth_path(@conference.short_title, booth), method: :patch, id: "cancel_booth_#{booth.id}" + +- if booth.transition_possible? :confirm + %li= link_to 'Confirm booth', + confirm_admin_conference_booth_path(@conference.short_title, booth), + method: :patch, id: "confirm_booth_#{booth.id}" diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index 28ef62e2..1f8bf6b5 100644 --- 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 + %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 diff --git a/config/routes.rb b/config/routes.rb index c4a5f6ce..1e26807c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -57,6 +57,7 @@ Osem::Application.routes.draw do patch :reset patch :to_reject patch :cancel + patch :confirm end end