Fix employee loading and schedule stuff for supplier
This commit is contained in:
@@ -5,13 +5,12 @@ App.EmployeeShift = DS.Model.extend
|
||||
description: attr('string')
|
||||
employee: DS.belongsTo 'employee', async: false
|
||||
supplier: DS.belongsTo 'supplier', async: false
|
||||
calendar_event: (->
|
||||
calendar_event: Ember.computed 'start_from', 'end_on', 'title', 'employee.color', ->
|
||||
id: @id
|
||||
title: @get('title')
|
||||
start: @get('start_from')
|
||||
end: @get('end_on')
|
||||
color: @get('employee.color')
|
||||
).property('start_from', 'end_on', 'title')
|
||||
|
||||
title: Ember.computed 'employee.name', 'description', ->
|
||||
if @get('description')
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
App.EmployeesRoute = Ember.Route.extend App.EmployeeActionsMixin,
|
||||
model: -> @store.findAll 'employee'
|
||||
model: -> @store.findAll 'employee', reload: false
|
||||
|
||||
+2
@@ -1,2 +1,4 @@
|
||||
App.ScheduleRoute = Ember.Route.extend
|
||||
beforeModel: ->
|
||||
@store.findAll 'employee', reload: false
|
||||
model: -> @store.findAll 'employee-shift'
|
||||
Reference in New Issue
Block a user