Mercurial > lbo > hg > analyrics

changeset 69:3d4401e111d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config db: update schema
author Lewin Bormann <lbo@spheniscida.de>
date Mon, 01 Aug 2022 09:38:09 -0700
parents 2a7b358c2710
children e76d019d95d2
files Rocket.toml schema/config_schema_sqlite.sql src/main.rs
diffstat 3 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Rocket.toml	Sun Jul 31 21:17:53 2022 -0700
+++ b/Rocket.toml	Mon Aug 01 09:38:09 2022 -0700
@@ -18,5 +18,6 @@
 
 template_dir = "assets"
 asset_path = "assets/static"
+# deploy_path should end with a slash in order to work with templates, etc.
 deploy_path = "/"
 geodb_path = "/usr/share/GeoIP/GeoLite2-City.mmdb"
--- a/schema/config_schema_sqlite.sql	Sun Jul 31 21:17:53 2022 -0700
+++ b/schema/config_schema_sqlite.sql	Mon Aug 01 09:38:09 2022 -0700
@@ -12,8 +12,18 @@
 DROP TABLE IF EXISTS domainpermissions;
 CREATE TABLE domainpermissions (
     id INTEGER PRIMARY KEY,
-    username TEXT NOT NULL,
+    user_id INTEGER NOT NULL,
     domain TEXT NOT NULL,
+    all_domains INTEGER,
+
+    FOREIGN KEY (user_id) REFERENCES users (id)
+);
 
-    FOREIGN KEY (username) REFERENCES users (username)
+DROP TABLE IF EXISTS permissions;
+CREATE TABLE permissions (
+    id INTEGER PRIMARY KEY,
+    user_id INTEGER NOT NULL,
+    is_admin INTEGER,
+
+    FOREIGN KEY (user_id) REFERENCES users (id)
 );
--- a/src/main.rs	Sun Jul 31 21:17:53 2022 -0700
+++ b/src/main.rs	Mon Aug 01 09:38:09 2022 -0700
@@ -578,23 +578,16 @@
         }
     };
 
-    let error = if let Some(flash) = &flash {
+    let (success, error) = if let Some(flash) = &flash {
         if flash.kind() == "error" {
-            Some(flash.message())
+            (None, Some(flash.message()))
+        } else if flash.kind() == "success" {
+            (Some(flash.message()), None)
         } else {
-            None
+            (None, None)
         }
     } else {
-        None
-    };
-    let success = if let Some(flash) = &flash {
-        if flash.kind() == "success" {
-            Some(flash.message())
-        } else {
-            None
-        }
-    } else {
-        None
+        (None, None)
     };
 
     Template::render(