1 files changed, 15 insertions, 17 deletions
diff --git a/lisp/service/about-us-service.lisp b/lisp/service/about-us-service.lisp
index 90e2625..f4b0f17 100644
--- a/lisp/service/about-us-service.lisp
+++ b/lisp/service/about-us-service.lisp
@@ -9,12 +9,6 @@
              :accessor category))
   (:documentation ""))
 
-(defun about-us-json (category &optional message errormsg)
-  (with-noauth (instance about-us-service)
-    (when (not (org-ckons-core::null-or-empty-p message)) (setf (message instance) message))
-    (when (not (org-ckons-core::null-or-empty-p errormsg)) (setf (errormsg instance) errormsg))
-    (setf (category instance) category)))
-
 (defclass about-us/view-service (about-us-service)
   ((content :initarg :content
             :initform nil
@@ -25,26 +19,30 @@
    (location :initform nil))
   (:documentation ""))
 
+(defclass about-us/modify-service (about-us/view-service auth-service)
+  ((form :initarg :form
+         :initform nil
+         :accessor form)
+   (admin-p :initform t)
+   (location-p :initform nil))
+  (:documentation ""))
+
+(defun about-us-json (category &optional message errormsg)
+  (with-noauth (instance about-us-service)
+    (setf (message instance) message)
+    (setf (errormsg instance) errormsg)
+    (setf (category instance) category)))
+
 (defun about-us-view-json (category)
   (with-noauth (instance about-us/view-service)
     (setf (category instance) category)
-    (with-valid-user (user "about-us-modify")
-        (setf (admin-p instance) nil)
-      (setf (admin-p instance) t))
+    (setf (admin-p instance) (with-valid-user (user "about-us-modify") nil t))
     (with-resume-database
       (let* ((general-pkg (make-instance 'general-pkg))
              (about-us (get-about-us general-pkg category)))
         (when about-us
           (setf (content instance) (content about-us)))))))
 
-(defclass about-us/modify-service (about-us/view-service auth-service)
-  ((form :initarg :form
-         :initform nil
-         :accessor form)
-   (admin-p :initform t)
-   (location-p :initform nil))
-  (:documentation ""))
-
 (defun about-us-modify-json (category)
   (with-auth (instance about-us/modify-service "about-us-modify")
     (with-resume-database