[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp

[BKNR Commits]

Revision: 3812
Author: hans
URL: http://bknr.net/trac/changeset/3812

Reorganize source to match control flow.

U   trunk/projects/bos/web/sponsor-handlers.lisp

Modified: trunk/projects/bos/web/sponsor-handlers.lisp
===================================================================
--- trunk/projects/bos/web/sponsor-handlers.lisp	2008-09-05 15:03:22 UTC (rev 3811)
+++ trunk/projects/bos/web/sponsor-handlers.lisp	2008-09-05 15:04:15 UTC (rev 3812)
@@ -330,16 +330,16 @@
   (redirect #?"/cert-regen/$((store-object-id contract))?action=wait")
 
 (defmethod handle-object-form ((handler cert-regen-handler) (action (eql :wait)) (contract contract))
-  (if (and (contract-certificates-generated-p contract)
-           (not (contract-tree-needs-update-p)))
+  (if (not (and (contract-certificates-generated-p contract)
+                (not (contract-tree-needs-update-p))))
+      (html (:html
+             (:head ((:meta :http-equiv "refresh"
+                            :content #?"2; url=/cert-regen/$((store-object-id contract))?action=wait")))
+             (:body "waiting for certificate to be regenerated...")))
       (with-bos-cms-page (:title "Certificate has been recreated")
         (html "The certificates for the sponsor have been re-generated." :br)
         (unless (contract-download-only-p contract)
           (mail-print-pdf contract)
           (html "The print certificate has been sent to the relevant BOS office address by email." :br))
         (let ((sponsor (contract-sponsor contract)))
-          (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor")))
-      (html (:html
-             (:head ((:meta :http-equiv "refresh"
-                           :content #?"2; url=/cert-regen/$((store-object-id contract))?action=wait")))
-             (:body "waiting for certificate to be regenerated...")))))
\ No newline at end of file
+          (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor")))))
\ No newline at end of file