From 1fc4439df81ac960ecb812f1a086b2c711ee6a71 Mon Sep 17 00:00:00 2001 From: Peng DU Date: Wed, 29 Jun 2016 17:58:53 +0200 Subject: [PATCH] click slot to show machine fetch --- app/assets/javascripts/controllers/calendar.coffee | 3 +++ app/views/api/availabilities/public.json.jbuilder | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/calendar.coffee b/app/assets/javascripts/controllers/calendar.coffee index e53f33d22..0b94c31ce 100644 --- a/app/assets/javascripts/controllers/calendar.coffee +++ b/app/assets/javascripts/controllers/calendar.coffee @@ -45,6 +45,9 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$ else if event.available_type == 'event' $state.go('app.public.events_show', {id: event.event_id}) + else if event.available_type == 'training' + else + $state.go('app.public.machines_show', {id: event.machine_id}) ## agendaDay view: disable slotEventOverlap ## agendaWeek view: enable slotEventOverlap diff --git a/app/views/api/availabilities/public.json.jbuilder b/app/views/api/availabilities/public.json.jbuilder index 0c1afead5..8b88ac698 100644 --- a/app/views/api/availabilities/public.json.jbuilder +++ b/app/views/api/availabilities/public.json.jbuilder @@ -32,8 +32,9 @@ json.array!(@availabilities) do |availability| json.borderColor availability_border_color(availability) end - # machine slot object + # machine slot object ( here => availability = slot ) else + json.machine_id availability.machine.id json.borderColor machines_slot_border_color(availability) json.tag_ids availability.availability.tag_ids json.tags availability.availability.tags do |t|