Skip to content

FOUR-25963: Guard missing setting keys when rendering admin settings #8699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eiresendez wants to merge 1 commit into
base: develop
Choose a base branch
from
+4 −2
Open

FOUR-25963: Guard missing setting keys when rendering admin settings #8699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions resources/js/admin/settings/components/SettingText.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ export default {
if (this.setting?.ui?.isNotEmpty) {
return this.transformed !== "" && this.transformed !== null;
}
if (this.setting.key.startsWith("white_list.")) {
const settingKey = this.setting?.key ?? "";
if (settingKey.startsWith("white_list.")) {
return this.validateURL(this.transformed);
}
return true;
Expand Down Expand Up @@ -190,7 +191,8 @@ export default {
if (this.setting.ui?.isNotEmpty && (this.transformed === "" || this.transformed === null)) {
return;
}
if (this.setting.key.startsWith("white_list.")) {
const settingKey = this.setting?.key ?? "";
if (settingKey.startsWith("white_list.")) {
if (!this.validateURL(this.transformed)) {
return;
}
Expand Down
Loading