rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #5393 -- Error tab display on Station Form.

This commit is contained in:
Buster "Silver Eagle" Neece 2022-06-01 22:26:17 -05:00
parent df7aedf931
commit 7046e16458
No known key found for this signature in database
GPG Key ID: F1D2E64A0005E80E
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/vue/components/Admin/Stations/StationForm.vue
View File

@ -139,6 +139,12 @@ export default {
],
};
function mergeCustom(objValue, srcValue) {
if (_.isArray(objValue)) {
return objValue.concat(srcValue);
}
}
if (this.showAdvanced) {
const advancedValidations = {
form: {
@ -170,7 +176,7 @@ export default {
],
};
_.merge(formValidations, advancedValidations);
_.mergeWith(formValidations, advancedValidations, mergeCustom);
}
if (this.showAdminTab) {
@ -187,7 +193,7 @@ export default {
]
};
_.merge(formValidations, adminValidations);
_.mergeWith(formValidations, adminValidations, mergeCustom);
if (this.showAdvanced) {
const advancedAdminValidations = {
@ -199,19 +205,18 @@ export default {
]
}
_.merge(formValidations, advancedAdminValidations);
_.mergeWith(formValidations, advancedAdminValidations, mergeCustom);
}
}
console.log(formValidations);
return formValidations;
},
data() {
return {
loading: true,
error: null,
form: {}
form: {},
station: {},
};
},
watch: {