From f208caf5b002aed9f1302c4d460062a46a4b674c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 1 Mar 2017 14:47:59 +0100 Subject: [PATCH] fix change space reservation when many users on the slot does not change the good user --- app/controllers/api/availabilities_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/availabilities_controller.rb b/app/controllers/api/availabilities_controller.rb index c2cf8b437..3c5b51184 100644 --- a/app/controllers/api/availabilities_controller.rb +++ b/app/controllers/api/availabilities_controller.rb @@ -279,11 +279,11 @@ class API::AvailabilitiesController < API::ApiController r.slots.each do |s| if slot.space.id == r.reservable_id if s.start_at == slot.start_at and s.canceled_at == nil - slot.id = s.id slot.can_modify = true if user_role === 'admin' slot.reservations.push r end if s.start_at == slot.start_at and r.user == user and s.canceled_at == nil + slot.id = s.id slot.title = t('availabilities.i_ve_reserved') slot.can_modify = true slot.is_reserved = true