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/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}"