Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/events/view/sessions/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {

@action
viewSession(session_id, event_id) {
this.transitionToRoute('public.sessions.view', event_id, session_id);
this.transitionToRoute('public.session.view', event_id, session_id);
}

@action
Expand Down
2 changes: 2 additions & 0 deletions app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ Router.map(function() {
this.route('public', { path: '/e/:event_id' }, function() {
this.route('sessions', function() {
this.route('list', { path: '/:session_status' });
});
this.route('session', function() {
this.route('view', { path: '/:session_id' });
});
this.route('cfs', { path: '/cfs/:speaker_call_hash' }, function() {
Expand Down
File renamed without changes.
5 changes: 4 additions & 1 deletion app/routes/public/sessions/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import moment from 'moment';
@classic
export default class ListRoute extends Route {
titleToken() {
const defaultToken = this.l10n.t('All sessions');
if (!this.params) {return defaultToken}
switch (this.params.session_status) {
case 'all':
return this.l10n.t('All sessions');
return defaultToken;
case 'today':
return this.l10n.t('Today\'s Sessions');
case 'week':
Expand Down Expand Up @@ -71,6 +73,7 @@ export default class ListRoute extends Route {
return {
event : eventDetails,
session : await this.infinity.model('session', {
include : 'track,speakers,session-type',
filter : filterOptions,
perPage : 6,
startingPage : 1,
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/session-card.hbs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="event wide ui grid row">
{{#unless this.device.isMobile}}
<div class="ui card three wide computer six wide tablet column">
<a class="image" href="{{href-to 'public.sessions.view' this.session.event.id this.session.id}}">
<a class="image" href="{{href-to 'public.session.view' this.session.event.id this.session.id}}">
<Widgets::SafeImage @src={{if this.session.event.thumbnailImageUrl this.session.event.thumbnailImageUrl "assets/images/landing.jpg"}} />
</a>
</div>
{{/unless}}
<div class="ui card thirteen wide computer ten wide tablet sixteen wide mobile column">
<a class="main content" href="{{href-to 'public.sessions.view' this.session.event.id this.session.id}}">
<a class="main content" href="{{href-to 'public.session.view' this.session.event.id this.session.id}}">
<div class="header">
<span>{{this.session.title}}</span>
<div class="right floated author">
Expand Down