Merge pull request #5517 from tsiegleauq/motion-projection-controls
Allow motion of non existing change recos
This commit is contained in:
commit
aed17360e6
@ -9,6 +9,7 @@ import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-wi
|
|||||||
import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers';
|
import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers';
|
||||||
import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
|
import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
|
||||||
import { Searchable } from 'app/site/base/searchable';
|
import { Searchable } from 'app/site/base/searchable';
|
||||||
|
import { SlideOptions } from 'app/site/base/slide-options';
|
||||||
import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
|
import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
|
||||||
import { ViewTag } from 'app/site/tags/models/view-tag';
|
import { ViewTag } from 'app/site/tags/models/view-tag';
|
||||||
import { ViewUser } from 'app/site/users/models/view-user';
|
import { ViewUser } from 'app/site/users/models/view-user';
|
||||||
@ -315,12 +316,8 @@ export class ViewMotion extends BaseViewModelWithAgendaItemAndListOfSpeakers<Mot
|
|||||||
}
|
}
|
||||||
|
|
||||||
public getSlide(configService: ConfigService): ProjectorElementBuildDeskriptor {
|
public getSlide(configService: ConfigService): ProjectorElementBuildDeskriptor {
|
||||||
const slideOptions = [];
|
const slideOptions: SlideOptions = [
|
||||||
if (
|
{
|
||||||
(this.changeRecommendations && this.changeRecommendations.length) ||
|
|
||||||
(this.amendments && this.amendments.length)
|
|
||||||
) {
|
|
||||||
slideOptions.push({
|
|
||||||
key: 'mode',
|
key: 'mode',
|
||||||
displayName: _('Which version?'),
|
displayName: _('Which version?'),
|
||||||
default: configService.instant('motions_recommendation_text_mode'),
|
default: configService.instant('motions_recommendation_text_mode'),
|
||||||
@ -330,8 +327,8 @@ export class ViewMotion extends BaseViewModelWithAgendaItemAndListOfSpeakers<Mot
|
|||||||
{ value: 'diff', displayName: 'Diff version' },
|
{ value: 'diff', displayName: 'Diff version' },
|
||||||
{ value: 'agreed', displayName: 'Final version' }
|
{ value: 'agreed', displayName: 'Final version' }
|
||||||
]
|
]
|
||||||
});
|
}
|
||||||
}
|
];
|
||||||
|
|
||||||
return {
|
return {
|
||||||
getBasicProjectorElement: options => ({
|
getBasicProjectorElement: options => ({
|
||||||
|
Loading…
Reference in New Issue
Block a user