From 117e7316a00768e17f654a3c64a9eb5fb45aad72 Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Mon, 3 Aug 2020 09:27:43 -0400
Subject: fix(web/panettone): Fix more calls to (id nil) in new issue form

Change-Id: Id514d80e00005b7b7eb2f305e92af33ca70d6964
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1594
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
---
 web/panettone/src/panettone.lisp | 67 +++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

(limited to 'web/panettone')

diff --git a/web/panettone/src/panettone.lisp b/web/panettone/src/panettone.lisp
index 5473b27179..7594c3ab24 100644
--- a/web/panettone/src/panettone.lisp
+++ b/web/panettone/src/panettone.lisp
@@ -224,38 +224,41 @@
      (render/issue-list :issues issues))))
 
 (defun render/issue-form (&optional issue message)
-  (render ()
-    (:header
-     (:h1
-      (who:esc
-       (if (and issue (id issue))
-           "Edit Issue" "New Issue"))))
-    (:main
-     (render/alert message)
-     (:form :method "post"
-            :action (if (id issue)
-                        (format nil "/issues/~A"
-                                (id issue))
-                        "/issues")
-            :class "issue-form"
-            (:div
-             (:input :type "text"
-                     :id "subject"
-                     :name "subject"
-                     :placeholder "Subject"
-                     :value (subject issue)))
-
-            (:div
-             (:textarea :name "body"
-                        :placeholder "Description"
-                        :rows 10
-                        (who:esc (body issue))))
-
-            (:input :type "submit"
-                    :value
-                    (if (id issue)
-                        "Save Issue"
-                        "Create Issue"))))))
+  (let ((editing (and issue (id issue))))
+    (render ()
+      (:header
+       (:h1
+        (who:esc
+         (if editing "Edit Issue" "New Issue"))))
+      (:main
+       (render/alert message)
+       (:form :method "post"
+              :action (if editing
+                          (format nil "/issues/~A"
+                                  (id issue))
+                          "/issues")
+              :class "issue-form"
+              (:div
+               (:input :type "text"
+                       :id "subject"
+                       :name "subject"
+                       :placeholder "Subject"
+                       :value (when editing
+                                (subject issue))))
+
+              (:div
+               (:textarea :name "body"
+                          :placeholder "Description"
+                          :rows 10
+                          (who:esc
+                           (when editing
+                             (body issue)))))
+
+              (:input :type "submit"
+                      :value
+                      (if editing
+                          "Save Issue"
+                          "Create Issue")))))))
 
 (defun render/new-comment (issue-id)
   (who:with-html-output (*standard-output*)
-- 
cgit 1.4.1