tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename setting 'qr_code_url' to 'base_url'

Browse Source
This commit is contained in:
samturner3
2024-08-25 12:12:35 +10:00
parent e3175723ea
commit a0e9f10127
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/pages/printing/spoolQrCodePrintingDialog.tsx
View File

@@ -25,7 +25,7 @@ interface SpoolQRCodePrintingDialog {
const SpoolQRCodePrintingDialog: React.FC<SpoolQRCodePrintingDialog> = ({ spoolIds }) => { const SpoolQRCodePrintingDialog: React.FC<SpoolQRCodePrintingDialog> = ({ spoolIds }) => {
const t = useTranslate(); const t = useTranslate();
const baseUrlSetting = useGetSetting("qr_code_url"); const baseUrlSetting = useGetSetting("base_url");
const baseUrlRoot = const baseUrlRoot =
baseUrlSetting.data?.value !== undefined && JSON.parse(baseUrlSetting.data?.value) !== "" baseUrlSetting.data?.value !== undefined && JSON.parse(baseUrlSetting.data?.value) !== ""
? JSON.parse(baseUrlSetting.data?.value) ? JSON.parse(baseUrlSetting.data?.value)

12
client/src/pages/settings/generalSettings.tsx
View File

@@ -5,7 +5,7 @@ import { useGetSettings, useSetSetting } from "../../utils/querySettings";
export function GeneralSettings() { export function GeneralSettings() {
const settings = useGetSettings(); const settings = useGetSettings();
const setQrCodeUrl = useSetSetting("qr_code_url"); const setBaseUrl = useSetSetting("base_url");
const setCurrency = useSetSetting("currency"); const setCurrency = useSetSetting("currency");
const [form] = Form.useForm(); const [form] = Form.useForm();
const [messageApi, contextHolder] = message.useMessage(); const [messageApi, contextHolder] = message.useMessage();
@@ -16,7 +16,7 @@ export function GeneralSettings() {
if (settings.data) { if (settings.data) {
form.setFieldsValue({ form.setFieldsValue({
currency: JSON.parse(settings.data.currency.value), 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]); }, [settings.data, form]);
@@ -29,14 +29,14 @@ export function GeneralSettings() {
}, [setCurrency.isSuccess, messageApi, t]); }, [setCurrency.isSuccess, messageApi, t]);
// Handle form submit // 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 // Check if the currency has changed
if (settings.data?.currency.value !== JSON.stringify(values.currency)) { if (settings.data?.currency.value !== JSON.stringify(values.currency)) {
setCurrency.mutate(values.currency); setCurrency.mutate(values.currency);
} }
// Check if the QR code URL has changed // Check if the base URL has changed
if (settings.data?.qr_code_url.value !== JSON.stringify(values.qr_code_url)) { if (settings.data?.base_url.value !== JSON.stringify(values.base_url)) {
setQrCodeUrl.mutate(values.qr_code_url); setBaseUrl.mutate(values.base_url);
} }
}; };

2
spoolman/settings.py
View File

@@ -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_vendor", SettingType.ARRAY, json.dumps([]))
register_setting("extra_fields_filament", SettingType.ARRAY, json.dumps([])) register_setting("extra_fields_filament", SettingType.ARRAY, json.dumps([]))
register_setting("extra_fields_spool", 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(""))