Commit fcd7875b authored by Richard Blechinger's avatar Richard Blechinger
Browse files

Rename fallback_id to default_id

parent e3845e14
......@@ -511,8 +511,8 @@
if (this.resolveData.schedule.is_repetition === undefined) {
this.resolveData.schedule.is_repetition = false
}
if (this.resolveData.schedule.fallback_id === null) {
this.resolveData.schedule.fallback_id = 0
if (this.resolveData.schedule.default_id === null) {
this.resolveData.schedule.default_id = 0
}
if (this.resolveData.schedule.automation_id === null) {
this.resolveData.schedule.automation_id = 0
......
......@@ -253,7 +253,7 @@
is_repetition: false,
add_days_no: 0,
add_business_days_only: false,
fallback_id: 0,
default_id: 0,
automation_id: 0,
}
}
......
......@@ -286,7 +286,7 @@
createRepetitionSchedule() {
const {onlyBusinessDays, addNoOfDays} = this.getRepetitionParameters();
const {dstart, tstart, tend, rrule, until, fallback_id, automation_id, byweekday} = this.schedule;
const {dstart, tstart, tend, rrule, until, default_id, automation_id, byweekday} = this.schedule;
const newSchedule = {
schedule: {
......@@ -295,7 +295,7 @@
tend,
rrule,
until,
fallback_id,
default_id,
automation_id,
byweekday,
is_repetition: true,
......
......@@ -7,11 +7,11 @@
>
<p v-if="loaded">
{{ $t('playlistSelector.currentPlaylistLabel') }}:
<span v-if="selectedShow.fallback_id === null">
<span v-if="selectedShow.default_id === null">
<i><small>{{ $t('noneSetFeminine') }}</small></i>
</span>
<span v-else>
{{ selectedShow.fallback_id }},
{{ selectedShow.default_id }},
<br>
<span v-if="currentPlaylistDescription">
{{ $t('showMeta.description') }}: <b>{{ currentPlaylistDescription }}</b>
......@@ -52,7 +52,7 @@
<template v-slot:cell(actions)="data">
<b-button-group size="sm">
<b-button
v-if="data.item.id !== selectedShow.fallback_id"
v-if="data.item.id !== selectedShow.default_id"
variant="info"
@click="choose(data.item.id)"
>
......@@ -114,8 +114,8 @@
currentPlaylistDescription() {
let description = false
if (this.selectedShow.fallback_id !== null) {
let choosenList = this.playlists.find(list => list.id === this.selectedShow.fallback_id)
if (this.selectedShow.default_id !== null) {
let choosenList = this.playlists.find(list => list.id === this.selectedShow.default_id)
if (choosenList && choosenList.description.length > 0) {
description = choosenList.description
}
......
......@@ -121,7 +121,7 @@
<b-badge variant="light">
{{ $t('showMeta.defaultPlaylistId') }}:
</b-badge>
<span v-if="!selectedShow.fallback_id"><small><i>{{ $t('noneSetFeminine') }}</i></small></span>
<span v-if="!selectedShow.default_id"><small><i>{{ $t('noneSetFeminine') }}</i></small></span>
<span v-else>{{ fallbackInfo }}</span>
<img
src="/assets/edit.svg"
......@@ -369,9 +369,9 @@
},
fallbackInfo() {
const list = this.playlists.find(p => p.id === this.selectedShow.fallback_id)
const list = this.playlists.find(p => p.id === this.selectedShow.default_id)
if (!list) {
return this.selectedShow.fallback_id
return this.selectedShow.default_id
} else {
return list.description + ' (ID: ' + list.id + ')'
}
......@@ -486,7 +486,7 @@
},
saveFallback(id) {
this.saveProperty('fallback_id', id, this.$refs.modalFallback)
this.saveProperty('default_id', id, this.$refs.modalFallback)
this.$log.debug(this.playlists)
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment