diff options
| author | ckonstanski <ckonstanski@pippiandcarlos.com> | 2020-12-27 11:06:24 -0700 |
|---|---|---|
| committer | ckonstanski <ckonstanski@pippiandcarlos.com> | 2020-12-27 11:06:24 -0700 |
| commit | 30421258c56accea65ee52f64599c72f73cb053a (patch) | |
| tree | e33a2f9c1a4d7745b8c7a2162c8df55f41f463f6 | |
| parent | 37889cb9d5bb58c659ffcee6c4d20040fc16d5e2 (diff) | |
removed unnecessary :url parameter in menu config
| -rw-r--r-- | service/auth-service.lisp | 12 | ||||
| -rw-r--r-- | service/menu-service.lisp | 16 |
2 files changed, 12 insertions, 16 deletions
diff --git a/service/auth-service.lisp b/service/auth-service.lisp index 1702bde..d250058 100644 --- a/service/auth-service.lisp +++ b/service/auth-service.lisp @@ -22,9 +22,9 @@ (org-ckons-json::objects-to-json `(,,instance)))) (defmacro with-noauth ((instance rest-service) &body body) - `(let ((,instance (make-instance ',rest-service))) - ,@body - (when (location-p ,instance) - (setf (session-value :message) nil) - (setf (session-value :errormsg) nil)) - (org-ckons-json::objects-to-json `(,,instance)))) + `(let ((,instance (make-instance ',rest-service))) + ,@body + (when (location-p ,instance) + (setf (session-value :message) nil) + (setf (session-value :errormsg) nil)) + (org-ckons-json::objects-to-json `(,,instance)))) diff --git a/service/menu-service.lisp b/service/menu-service.lisp index b3f05de..0b82f22 100644 --- a/service/menu-service.lisp +++ b/service/menu-service.lisp @@ -3,11 +3,11 @@ (in-package #:ldapadmin) -(defparameter *menu-config* '((:id "a_menu_home" :label "Home" :url "/home" :handler "/home" :permission "t") - (:id "a_menu_login" :label "Login" :url "/login" :handler "/login" :permission "anonymous") - (:id "a_menu_logout" :label "Logout" :url "/logout" :handler "/logout" :permission "admin") - (:id "a_menu_inetorg_view" :label "View InetOrg Entries" :url "/inetorg/view" :handler "/inetorg/view" :permission "admin") - (:id "a_menu_inetorg_add" :label "Add InetOrg Entry" :url "/inetorg/add" :handler "/inetorg/add" :permission "admin"))) +(defparameter *menu-config* '((:id "a_menu_home" :label "Home" :handler "/home" :permissions "t") + (:id "a_menu_login" :label "Login" :handler "/login" :permissions "anonymous") + (:id "a_menu_logout" :label "Logout" :handler "/logout" :permissions "admin") + (:id "a_menu_inetorg_view" :label "View InetOrg Entries" :handler "/inetorg/view" :permissions "admin") + (:id "a_menu_inetorg_add" :label "Add InetOrg Entry" :handler "/inetorg/add" :permissions "admin"))) (defclass menuitem () ((id :initarg :id @@ -16,9 +16,6 @@ (label :initarg :label :initform nil :accessor label) - (url :initarg :url - :initform nil - :accessor url) (handler :initarg :handler :initform nil :accessor handler) @@ -45,11 +42,10 @@ (make-instance 'menuitem :id (getf x :id) :label (getf x :label) - :url (getf x :url) :handler (getf x :handler))) (remove-if 'null (mapcar (lambda (x) (when (find-if (lambda (y) - (string= (getf x :permission) y)) + (string= (getf x :permissions) y)) `("t" ,(session-value :permissions))) x)) *menu-config*))))) |