From 7b8543fce8c49aabd7158dd879718cf31bb23638 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 7 Jan 2024 00:25:23 -0800 Subject: [PATCH] Rename to general config --- src-ui/src/app/data/paperless-config.ts | 4 ++-- src/documents/views.py | 11 +++++------ src/paperless/config.py | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src-ui/src/app/data/paperless-config.ts b/src-ui/src/app/data/paperless-config.ts index 4f4515f0b..6ba3d06cf 100644 --- a/src-ui/src/app/data/paperless-config.ts +++ b/src-ui/src/app/data/paperless-config.ts @@ -46,8 +46,8 @@ export enum ConfigOptionType { } export const ConfigCategory = { + General: $localize`General Settings`, OCR: $localize`OCR Settings`, - Frontend: $localize`Frontend Settings`, } export interface ConfigOption { @@ -170,7 +170,7 @@ export const PaperlessConfigOptions: ConfigOption[] = [ title: $localize`Application Title`, type: ConfigOptionType.String, config_key: 'PAPERLESS_APP_TITLE', - category: ConfigCategory.Frontend, + category: ConfigCategory.General, }, ] diff --git a/src/documents/views.py b/src/documents/views.py index b7dbe610f..230c7ac6d 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -120,7 +120,7 @@ from documents.serialisers import WorkflowTriggerSerializer from documents.signals import document_updated from documents.tasks import consume_file from paperless import version -from paperless.config import FrontendConfig +from paperless.config import GeneralConfig from paperless.db import GnuPG from paperless.views import StandardPagination @@ -1166,12 +1166,11 @@ class UiSettingsView(GenericAPIView): "backend_setting": settings.ENABLE_UPDATE_CHECK, } - frontend_config = FrontendConfig() + general_config = GeneralConfig() - if settings.APP_TITLE is not None: - ui_settings["app_title"] = settings.APP_TITLE - if frontend_config.app_title is not None and len(frontend_config.app_title) > 0: - ui_settings["app_title"] = frontend_config.app_title + ui_settings["app_title"] = settings.APP_TITLE + if general_config.app_title is not None and len(general_config.app_title) > 0: + ui_settings["app_title"] = general_config.app_title user_resp = { "id": user.id, diff --git a/src/paperless/config.py b/src/paperless/config.py index 98668d56f..9da5974b2 100644 --- a/src/paperless/config.py +++ b/src/paperless/config.py @@ -99,9 +99,9 @@ class OcrConfig(OutputTypeConfig): @dataclasses.dataclass -class FrontendConfig(BaseConfig): +class GeneralConfig(BaseConfig): """ - Frontend application settings that require global scope + General application settings that require global scope """ app_title: str = dataclasses.field(init=False)