From e65b87cc332a7ab8f68db2f8b50a599e42c1ec0a Mon Sep 17 00:00:00 2001 From: samturner3 Date: Mon, 26 Aug 2024 18:34:00 +1000 Subject: [PATCH] fix: Remove some en, ensure setting is default false --- client/public/locales/en/common.json | 6 ------ client/src/pages/printing/qrCodePrintingDialog.tsx | 1 + client/src/pages/printing/spoolQrCodePrintingDialog.tsx | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json index e79e120..9eeec7f 100644 --- a/client/public/locales/en/common.json +++ b/client/public/locales/en/common.json @@ -109,12 +109,6 @@ "templateHelp": "Use {} to insert values of the spool object as text. For example {id} will be replaced with the spool id, or {filament.material} will be replaced with the material of the spool. Enclose text with double asterix ** to make it bold. Click the button to view a list of all available tags.", "textSize": "Label Text Size", "showContent": "Print Label", - "showLotNr": "Lot Nr", - "showSpoolWeight": "Spool Weight", - "showTemperatures": "Temperatures", - "showSpoolComment": "Spool Comment", - "showFilamentComment": "Filament Comment", - "showVendorComment": "Vendor Comment", "useHTTPUrl": { "label": "QR code link", "tooltip": "Will use proprietary link that will work only if scanned from Spoolman's scanning feature (default). URL uses either the base URL specified in settings, or the current page URL if not set.", diff --git a/client/src/pages/printing/qrCodePrintingDialog.tsx b/client/src/pages/printing/qrCodePrintingDialog.tsx index d3a51b1..7e6fc34 100644 --- a/client/src/pages/printing/qrCodePrintingDialog.tsx +++ b/client/src/pages/printing/qrCodePrintingDialog.tsx @@ -153,6 +153,7 @@ const QRCodePrintingDialog: React.FC = ({ + {extraSettings} } diff --git a/client/src/pages/printing/spoolQrCodePrintingDialog.tsx b/client/src/pages/printing/spoolQrCodePrintingDialog.tsx index 40a6b7c..e6b695e 100644 --- a/client/src/pages/printing/spoolQrCodePrintingDialog.tsx +++ b/client/src/pages/printing/spoolQrCodePrintingDialog.tsx @@ -31,7 +31,7 @@ const SpoolQRCodePrintingDialog: React.FC = ({ spoolI ? JSON.parse(baseUrlSetting.data?.value) : window.location.origin; const [messageApi, contextHolder] = message.useMessage(); - const [useHTTPUrl, setUseHTTPUrl] = useSavedState("print-useHTTPUrl", baseUrlSetting.data?.value !== ""); + const [useHTTPUrl, setUseHTTPUrl] = useSavedState("print-useHTTPUrl", false); const itemQueries = useGetSpoolsByIds(spoolIds); const items = itemQueries