From 1fd633dffdd3ccccad5f1bc9713c7f434fe249ae Mon Sep 17 00:00:00 2001 From: glittershark Date: Sun, 9 Aug 2020 18:36:11 +0000 Subject: fix(web/panettone): revert "implement shorthand issue URLs" This reverts commit 311511385455f680aedf78aab761fcebf3ca7731. Reason for revert: this is causing all issues to return a 404 - reverting until we can get it working. Change-Id: I5f3c5ec3b24f245a1f7ef12645200d16ed0f1b35 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1721 Tested-by: BuildkiteCI Reviewed-by: edef --- web/panettone/src/panettone.lisp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'web/panettone/src/panettone.lisp') diff --git a/web/panettone/src/panettone.lisp b/web/panettone/src/panettone.lisp index cf9c608b077c..7594c3ab2408 100644 --- a/web/panettone/src/panettone.lisp +++ b/web/panettone/src/panettone.lisp @@ -369,9 +369,8 @@ (render/new-comment (id issue)))))))))) (defun render/not-found (entity-type) - (setf (hunchentoot:return-code*) 404) (render () - (:h1 (who:esc entity-type) " Not Found"))) + (:h1 (who:esc entity-type) "Not Found"))) ;;; ;;; HTTP handlers @@ -453,12 +452,10 @@ (defroute show-issue ("/issues/:id" :decorators (@auth-optional @handle-issue-not-found)) (&path (id 'integer)) - (when id - (let* ((issue (model:get-issue id)) - (*title* (format nil "~A | Panettone" - (subject issue)))) - (render/issue issue)) - (render/not-found "Issue"))) + (let* ((issue (model:get-issue id)) + (*title* (format nil "~A | Panettone" + (subject issue)))) + (render/issue issue))) (defroute edit-issue ("/issues/:id/edit" :decorators (@auth @handle-issue-not-found)) @@ -519,13 +516,6 @@ (setf (hunchentoot:content-type*) "text/css") (apply #'lass:compile-and-write panettone.css:styles)) -(defroute shorthand-issue - ("/:id" :decorators (@auth-optional)) - (&path (id 'integer)) - (if id - (hunchentoot:redirect (format nil "/issues/~A" id)) - (render/not-found "Route"))) - (defvar *acceptor* nil "Hunchentoot acceptor for Panettone's web server.") -- cgit 1.4.1