rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

click slot to show machine fetch

Browse Source
This commit is contained in:
Peng DU 2016-06-29 17:58:53 +02:00
parent 2b08cc8594
commit 1fc4439df8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/controllers/calendar.coffee
View File

@ -45,6 +45,9 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
else else
if event.available_type == 'event' if event.available_type == 'event'
$state.go('app.public.events_show', {id: event.event_id}) $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 ## agendaDay view: disable slotEventOverlap
## agendaWeek view: enable slotEventOverlap ## agendaWeek view: enable slotEventOverlap

3
app/views/api/availabilities/public.json.jbuilder
View File

@ -32,8 +32,9 @@ json.array!(@availabilities) do |availability|
json.borderColor availability_border_color(availability) json.borderColor availability_border_color(availability)
end end
# machine slot object # machine slot object ( here => availability = slot )
else else
json.machine_id availability.machine.id
json.borderColor machines_slot_border_color(availability) json.borderColor machines_slot_border_color(availability)
json.tag_ids availability.availability.tag_ids json.tag_ids availability.availability.tag_ids
json.tags availability.availability.tags do |t| json.tags availability.availability.tags do |t|