From 1b014841abadea6505d58604a4a3e5c562e03a89 Mon Sep 17 00:00:00 2001
From: Dietrich <dietrich@teilgedanken.de>
Date: Mon, 4 Oct 2021 12:09:07 +0200
Subject: [PATCH] restructure an if

---
 app/src/pages/list_links.rs | 16 ++++++++--------
 app/src/pages/list_users.rs |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/pages/list_links.rs b/app/src/pages/list_links.rs
index fed1d1f..fb678cc 100644
--- a/app/src/pages/list_links.rs
+++ b/app/src/pages/list_links.rs
@@ -821,14 +821,7 @@ fn edit_or_create_link<F: Fn(&str) -> String>(
             ],
             tr![
                 th![t("qr-code")],
-                if let Loadable::Data(Some(qr)) = qr {
-                    td![a![
-                        span![C!["qrdownload"], "Download", raw!(&qr.svg),],
-                        attrs!(At::Href => qr.url, At::Download => "qr-code.png")
-                    ]]
-                } else {
-                    td!["Loading..."]
-                }
+                qr.as_ref().map_or_else(|| td!["Loading..."], render_qr),
             ]
         ],
         a![
@@ -842,6 +835,13 @@ fn edit_or_create_link<F: Fn(&str) -> String>(
     ]
 }
 
+fn render_qr(qr: &QrGuard) -> Node<Msg> {
+    td![a![
+        span![C!["qrdownload"], "Download", raw!(&qr.svg),],
+        attrs!(At::Href => qr.url, At::Download => "qr-code.png")
+    ]]
+}
+
 /// generate a qr-code for a code
 fn generate_qr_from_code(code: &str) -> String {
     generate_qr_from_link(&format!("https://{}/{}", get_host(), code))
diff --git a/app/src/pages/list_users.rs b/app/src/pages/list_users.rs
index d726b40..fb73962 100644
--- a/app/src/pages/list_users.rs
+++ b/app/src/pages/list_users.rs
@@ -393,7 +393,7 @@ fn view_user_table_head<F: Fn(&str) -> String>(t: F) -> Node<Msg> {
     ]
 }
 
-/// Display the filterboxes below the headlines
+/// Display the filter-boxes below the headlines
 fn view_user_table_filter_input<F: Fn(&str) -> String>(model: &Model, t: F) -> Node<Msg> {
     tr![
         C!["filters"],