Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions app/components/public/session-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
<div class="left floated nine wide column">
{{#each @session.speakers as |speaker|}}
{{speaker.name}} ({{speaker.position}}, {{speaker.organisation}})
{{speaker.name}} {{#if (or speaker.position speaker.positionOrganisation)}}({{speaker.positionOrganisation}}){{/if}}
<br>
{{/each}}
</div>
Expand Down Expand Up @@ -119,7 +119,7 @@
<br>
{{speaker.name}}
<br>
{{speaker.position}}, {{speaker.organisation}}
{{speaker.positionOrganisation}}
<br>
{{#if speaker.shortBiography}}
{{sanitize speaker.shortBiography}}
Expand Down
3 changes: 1 addition & 2 deletions app/components/public/session-item.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import { action } from '@ember/object';
import Component from '@glimmer/component';
import { inject as service } from '@ember/service';
Expand All @@ -7,7 +6,7 @@ import { extractYoutubeUrl } from 'open-event-frontend/utils/url';

export default class SessionItem extends Component {
@service router;

@tracked
hideImage = this.args.expanded;

Expand Down
5 changes: 5 additions & 0 deletions app/models/speaker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import attr from 'ember-data/attr';
import ModelBase from 'open-event-frontend/models/base';
import { belongsTo, hasMany } from 'ember-data/relationships';
import { computed } from '@ember/object';

export default class Speaker extends ModelBase.extend({

Expand Down Expand Up @@ -43,6 +44,10 @@ export default class Speaker extends ModelBase.extend({
event : belongsTo('event'),
sessions : hasMany('session'),

positionOrganisation: computed('position', 'organization', function() {
return [this.position, this.organisation].filter(Boolean).join(', ');
}),

ready() {
if (!this.complexFieldValues) {
this.complexFieldValues = {};
Expand Down