diff --git a/client/src/pages/printing/spoolQrCodePrintingDialog.tsx b/client/src/pages/printing/spoolQrCodePrintingDialog.tsx index b3bf763..b11ad67 100644 --- a/client/src/pages/printing/spoolQrCodePrintingDialog.tsx +++ b/client/src/pages/printing/spoolQrCodePrintingDialog.tsx @@ -25,7 +25,7 @@ interface SpoolQRCodePrintingDialog { const SpoolQRCodePrintingDialog: React.FC = ({ spoolIds }) => { const t = useTranslate(); - const baseUrlSetting = useGetSetting("qr_code_url"); + const baseUrlSetting = useGetSetting("base_url"); const baseUrlRoot = baseUrlSetting.data?.value !== undefined && JSON.parse(baseUrlSetting.data?.value) !== "" ? JSON.parse(baseUrlSetting.data?.value) diff --git a/client/src/pages/settings/generalSettings.tsx b/client/src/pages/settings/generalSettings.tsx index c421583..e78a5cc 100644 --- a/client/src/pages/settings/generalSettings.tsx +++ b/client/src/pages/settings/generalSettings.tsx @@ -5,7 +5,7 @@ import { useGetSettings, useSetSetting } from "../../utils/querySettings"; export function GeneralSettings() { const settings = useGetSettings(); - const setQrCodeUrl = useSetSetting("qr_code_url"); + const setBaseUrl = useSetSetting("base_url"); const setCurrency = useSetSetting("currency"); const [form] = Form.useForm(); const [messageApi, contextHolder] = message.useMessage(); @@ -16,7 +16,7 @@ export function GeneralSettings() { if (settings.data) { form.setFieldsValue({ currency: JSON.parse(settings.data.currency.value), - qr_code_url: JSON.parse(settings.data.qr_code_url.value), + base_url: JSON.parse(settings.data.base_url.value), }); } }, [settings.data, form]); @@ -29,14 +29,14 @@ export function GeneralSettings() { }, [setCurrency.isSuccess, messageApi, t]); // Handle form submit - const onFinish = (values: { currency: string; qr_code_url: string }) => { + const onFinish = (values: { currency: string; base_url: string }) => { // Check if the currency has changed if (settings.data?.currency.value !== JSON.stringify(values.currency)) { setCurrency.mutate(values.currency); } - // Check if the QR code URL has changed - if (settings.data?.qr_code_url.value !== JSON.stringify(values.qr_code_url)) { - setQrCodeUrl.mutate(values.qr_code_url); + // Check if the base URL has changed + if (settings.data?.base_url.value !== JSON.stringify(values.base_url)) { + setBaseUrl.mutate(values.base_url); } }; diff --git a/spoolman/settings.py b/spoolman/settings.py index 6f0f8cc..ccd3ad5 100644 --- a/spoolman/settings.py +++ b/spoolman/settings.py @@ -67,4 +67,4 @@ register_setting("print_presets", SettingType.ARRAY, json.dumps([])) register_setting("extra_fields_vendor", SettingType.ARRAY, json.dumps([])) register_setting("extra_fields_filament", SettingType.ARRAY, json.dumps([])) register_setting("extra_fields_spool", SettingType.ARRAY, json.dumps([])) -register_setting("qr_code_url", SettingType.STRING, json.dumps("")) +register_setting("base_url", SettingType.STRING, json.dumps(""))