Merge branch 'valid' into 'master'

Block requesting invalid Service items from UI.

See merge request openlp/web-remote!20
This commit is contained in:
Raoul Snyman 2020-05-20 17:04:53 +00:00
commit 24c74ab3c9
3 changed files with 16 additions and 11 deletions

2
.gitignore vendored
View File

@ -21,7 +21,7 @@
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
.vscode/launch.json
!.vscode/extensions.json
# misc

View File

@ -20,8 +20,10 @@ export class ServiceComponent implements OnInit {
}
onItemSelected(item) {
this.openlpService.setServiceItem(item.id).subscribe();
this.router.navigate(['slides']);
if (item.is_valid) {
this.openlpService.setServiceItem(item.id).subscribe();
this.router.navigate(['slides']);
}
}
getServiceItems() {
@ -35,7 +37,9 @@ export class ServiceComponent implements OnInit {
}
getIcon(item: ServiceItem): string {
if (item.plugin === 'songs') {
if (!item.is_valid) {
return 'delete';
} else if (item.plugin === 'songs') {
return 'queue_music';
} else if (item.plugin === 'images') {
return 'image';

View File

@ -27,16 +27,17 @@ export interface Slide {
}
export interface ServiceItem {
id: string;
notes: string;
plugin: string;
selected: boolean;
title: string;
id: string;
notes: string;
plugin: string;
selected: boolean;
title: string;
is_valid: boolean;
}
export interface Theme {
selected: boolean;
name: string;
selected: boolean;
name: string;
}
export interface MainView {