Skip to content

Commit 0717c45

Browse files
fix: Scheduler track color and obsolete action (#4756)
1 parent c249e15 commit 0717c45

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

app/components/scheduler/unscheduled-session.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default class UnscheduledSession extends Component {
1717
stick : true, // maintain when user navigates (see docs on the renderEvent method)
1818
id : $element.attr('id'),
1919
serverId : this.session.id, // id of the session on the server
20-
color : this.session.track.color
20+
color : this.session.get('track.color')
2121

2222
});
2323
$element.draggable({
@@ -26,7 +26,7 @@ export default class UnscheduledSession extends Component {
2626
revertDuration : 0 // original position after the drag
2727
});
2828
$element.data('serverId', this.session.id);
29-
$element.css('border-color', this.session.track.color);
29+
$element.css('border-color', this.session.get('track.color'));
3030

3131
}
3232

app/templates/events/view/scheduler.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
@groupByResource={{true}}
3030
@resourceLabelText="Rooms"
3131
@header={{this.model.header}}
32-
@ondragover="{{action 'allowDrop' this.event}}"
3332
@views={{this.model.views}}
3433
@viewName="agendaDay"
3534
@drop={{action "drop"}}

tests/integration/components/scheduler/unscheduled-session-test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { hbs } from 'ember-cli-htmlbars';
2+
import EmberObject from '@ember/object';
23
import { render } from '@ember/test-helpers';
34
import { module, test } from 'qunit';
45
import { setupIntegrationTest } from 'open-event-frontend/tests/helpers/setup-integration-test';
@@ -7,11 +8,11 @@ module('Integration | Component | scheduler/unscheduled session', function(hooks
78
setupIntegrationTest(hooks);
89

910
test('it renders', async function(assert) {
10-
this.set('session', {
11+
this.set('session', EmberObject.create({
1112
track: {
1213
color: '#fff333'
1314
}
14-
});
15+
}));
1516
await render(hbs`{{scheduler/unscheduled-session session=session}}`);
1617
assert.ok(this.element.innerHTML.trim().includes('|'));
1718
});

0 commit comments

Comments
 (0)