Skip to content

Commit

Permalink
fix: Scheduler track color and obsolete action (#4756)
Browse files Browse the repository at this point in the history
  • Loading branch information
iamareebjamal authored Aug 13, 2020
1 parent c249e15 commit 0717c45
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/components/scheduler/unscheduled-session.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class UnscheduledSession extends Component {
stick : true, // maintain when user navigates (see docs on the renderEvent method)
id : $element.attr('id'),
serverId : this.session.id, // id of the session on the server
color : this.session.track.color
color : this.session.get('track.color')

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

}

Expand Down
1 change: 0 additions & 1 deletion app/templates/events/view/scheduler.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
@groupByResource={{true}}
@resourceLabelText="Rooms"
@header={{this.model.header}}
@ondragover="{{action 'allowDrop' this.event}}"
@views={{this.model.views}}
@viewName="agendaDay"
@drop={{action "drop"}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { hbs } from 'ember-cli-htmlbars';
import EmberObject from '@ember/object';
import { render } from '@ember/test-helpers';
import { module, test } from 'qunit';
import { setupIntegrationTest } from 'open-event-frontend/tests/helpers/setup-integration-test';
Expand All @@ -7,11 +8,11 @@ module('Integration | Component | scheduler/unscheduled session', function(hooks
setupIntegrationTest(hooks);

test('it renders', async function(assert) {
this.set('session', {
this.set('session', EmberObject.create({
track: {
color: '#fff333'
}
});
}));
await render(hbs`{{scheduler/unscheduled-session session=session}}`);
assert.ok(this.element.innerHTML.trim().includes('|'));
});
Expand Down

1 comment on commit 0717c45

@vercel
Copy link

@vercel vercel bot commented on 0717c45 Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.