openlp/web-remote
1
0
Fork 0
mirror of https://gitlab.com/openlp/web-remote.git synced 2024-12-22 19:32:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'valid' into 'master'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

6
src/app/components/service/service.component.ts
View File

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

1
src/app/responses.ts
View File

@ -32,6 +32,7 @@ export interface ServiceItem {
plugin: string; plugin: string;
selected: boolean; selected: boolean;
title: string; title: string;
is_valid: boolean;
} }
export interface Theme { export interface Theme {