diff options
| author | ckonstanski <ckonstanski@pippiandcarlos.com> | 2020-12-24 23:02:24 -0700 |
|---|---|---|
| committer | ckonstanski <ckonstanski@pippiandcarlos.com> | 2020-12-24 23:02:24 -0700 |
| commit | ad85a68776a44a7d8cb7366488c0ac9393905120 (patch) | |
| tree | 6c0e161384d0596d1b1beb666ca1132deb23820e | |
| parent | e678d9ba62cd44795fe8d4b882e61dfbd672729e (diff) | |
fixed message and errormsg, added with-noauth macro
| -rw-r--r-- | service/login-service.lisp | 2 | ||||
| -rw-r--r-- | service/logout-service.lisp | 10 | ||||
| -rw-r--r-- | service/menu-service.lisp | 3 | ||||
| -rw-r--r-- | webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/service/login-service.lisp b/service/login-service.lisp index a911c49..1e895be 100644 --- a/service/login-service.lisp +++ b/service/login-service.lisp @@ -23,7 +23,7 @@ (defun login-json () (with-noauth (instance login-service) - nil)) + t)) (defclass login-authenticate-service (rest-service) ((location-p :initform nil)) diff --git a/service/logout-service.lisp b/service/logout-service.lisp index 54a02b4..d7ab412 100644 --- a/service/logout-service.lisp +++ b/service/logout-service.lisp @@ -7,10 +7,8 @@ ((location-p :initform nil)) (:documentation "")) -(defmethod initialize-instance :after ((logout-service logout-service) &key) - (setf (location logout-service) "/home") - (setf (message logout-service) "You are now logged out.")) - (defun logout-json () - (setf (session-value :permissions) "anonymous") - (org-ckons-json::objects-to-json `(,(make-instance 'logout-service)))) + (with-noauth (instance logout-service) + (setf (session-value :permissions) "anonymous") + (setf (location instance) "/home") + (setf (message instance) "You are now logged out."))) diff --git a/service/menu-service.lisp b/service/menu-service.lisp index 86d114b..b3f05de 100644 --- a/service/menu-service.lisp +++ b/service/menu-service.lisp @@ -55,4 +55,5 @@ *menu-config*))))) (defun menu-json () - (org-ckons-json::objects-to-json `(,(make-instance 'menu-service)))) + (with-noauth (instance menu-service) + t)) diff --git a/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs b/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs index 649daf7..713a526 100644 --- a/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs +++ b/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs @@ -287,7 +287,7 @@ (defn handler-logout [response] (let [jsonobj (js->clj (js/JSON.parse response))] - (render-home "You are now logged out" "") + (render-home (get jsonobj "message") "") (dommy/set-html! (dommy/sel1 :#location) "/home") (render-menu))) |