Remove quick access order config option
authorAdam Dullage <redacted>
Tue, 17 Sep 2024 07:21:32 +0000 (08:21 +0100)
committerAdam Dullage <redacted>
Tue, 17 Sep 2024 07:21:32 +0000 (08:21 +0100)
client/views/Home.vue
server/global_config.py
server/main.py

index 810ccb998bd083478e93fd26c828e1d4541c3fbd..04d379696d2d60b170aad10270a4d58913a27bc3 100644 (file)
@@ -64,7 +64,10 @@ function init() {
   getNotes(
     globalStore.config.quickAccessTerm,
     globalStore.config.quickAccessSort,
-    globalStore.config.quickAccessOrder,
+    // Order by ascending if sorting by title, descending otherwise.
+    globalStore.config.quickAccessSort === "title"
+      ? "asc"
+      : "desc",
     // Limit is increased by 1 to check if there are more notes than the limit.
     globalStore.config.quickAccessLimit + 1,
   )
index df696c29473bbd5e599f3cb13f078247a7454ac5..897a09a61b6138c97a0ea40acd595391aede0afa 100644 (file)
@@ -13,7 +13,6 @@ class GlobalConfig:
         self.quick_access_title: str = self._quick_access_title()\r
         self.quick_access_term: str = self._quick_access_term()\r
         self.quick_access_sort: str = self._quick_access_sort()\r
-        self.quick_access_order: str = self._quick_access_order()\r
         self.quick_access_limit: int = self._quick_access_limit()\r
         self.path_prefix: str = self._load_path_prefix()\r
 \r
@@ -87,19 +86,6 @@ class GlobalConfig:
             sys.exit(1)\r
         return value\r
 \r
-    def _quick_access_order(self):\r
-        key = "FLATNOTES_QUICK_ACCESS_ORDER"\r
-        value = get_env(key, mandatory=False, default="desc")\r
-        valid_values = ["asc", "desc"]\r
-        if value not in valid_values:\r
-            logger.error(\r
-                f"Invalid value '{value}' for {key}. "\r
-                + "Must be one of: "\r
-                + ", ".join(valid_values)\r
-            )\r
-            sys.exit(1)\r
-        return value\r
-\r
     def _quick_access_limit(self):\r
         key = "FLATNOTES_QUICK_ACCESS_LIMIT"\r
         return get_env(key, mandatory=False, default=5, cast_int=True)\r
@@ -129,5 +115,4 @@ class GlobalConfigResponseModel(CustomBaseModel):
     quick_access_title: str\r
     quick_access_term: str\r
     quick_access_sort: str\r
-    quick_access_order: str\r
     quick_access_limit: int\r
index 4ec52ffe107f2b440039a43cc4c3adccb6f77ec1..1cc0701f8011f7065b3c88be4329658da1b10522 100644 (file)
@@ -182,7 +182,6 @@ def get_config():
         quick_access_title=global_config.quick_access_title,\r
         quick_access_term=global_config.quick_access_term,\r
         quick_access_sort=global_config.quick_access_sort,\r
-        quick_access_order=global_config.quick_access_order,\r
         quick_access_limit=global_config.quick_access_limit,\r
     )\r
 \r
git clone https://git.99rst.org/PROJECT