ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4006 from tsiegleauq/fix_list_of_speakers

Browse Source 
Fix broken nested agenda speaker
This commit is contained in:
Jochen Saalfeld 2018-11-12 14:52:51 +01:00 committed by GitHub
commit aa497ad543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/shared/models/agenda/speaker.ts
View File

@ -1,4 +1,4 @@
import { BaseModel } from '../base/base-model'; import { Deserializer } from '../base/deserializer';
/** /**
* Representation of a speaker in an agenda item. * Representation of a speaker in an agenda item.
@ -7,7 +7,7 @@ import { BaseModel } from '../base/base-model';
* Part of the 'speakers' list. * Part of the 'speakers' list.
* @ignore * @ignore
*/ */
export class Speaker extends BaseModel { export class Speaker extends Deserializer {
public id: number; public id: number;
public user_id: number; public user_id: number;
public begin_time: string; // TODO this is a time object public begin_time: string; // TODO this is a time object

4
client/src/app/site/base/base-view-model.ts
View File

@ -1,6 +1,6 @@
import { BaseModel } from '../../shared/models/base/base-model';
import { Displayable } from '../../shared/models/base/displayable'; import { Displayable } from '../../shared/models/base/displayable';
import { Identifiable } from '../../shared/models/base/identifiable'; import { Identifiable } from '../../shared/models/base/identifiable';
import { Deserializable } from 'app/shared/models/base/deserializable';
/** /**
* Base class for view models. alls view models should have titles. * Base class for view models. alls view models should have titles.
@ -11,7 +11,7 @@ export abstract class BaseViewModel implements Displayable, Identifiable {
*/ */
public abstract id: number; public abstract id: number;
public abstract updateValues(update: BaseModel): void; public abstract updateValues(update: Deserializable): void;
public abstract getTitle(): string; public abstract getTitle(): string;