diff options
Diffstat (limited to 'lisp/service/users-service.lisp')
| -rw-r--r-- | lisp/service/users-service.lisp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lisp/service/users-service.lisp b/lisp/service/users-service.lisp index d05dfb0..4143ad3 100644 --- a/lisp/service/users-service.lisp +++ b/lisp/service/users-service.lisp @@ -113,9 +113,9 @@ :reply-to (mail-postmaster *webapp*) :ssl (mail-ssl *webapp*) :authentication (mail-authentication *webapp*)) - (setf (session-value :message) (format nil "Email sent successfully to ~a" (email registration)))) + (setf (message instance) (format nil "Email sent successfully to ~a" (email registration)))) (error (e) - (setf (session-value :errormsg) (format nil "Error sending email to ~a. Registration failed. ~a" (email registration) e)))))))) + (setf (errormsg instance) (format nil "Error sending email to ~a. Registration failed. ~a" (email registration) e)))))))) (defclass users/register-service (rest-service) ((title :initarg :title @@ -155,7 +155,7 @@ (:name "pwd2" :label "Password (again)" :field-type "password" :required "required") (:name "phone" :label "Phone" :field-type "text") (:label "Register" :field-type "button" :onclick "on_users_register_submit_clicked()")))) - (setf (session-value :errormsg) "Error: invalid registration.")))))) + (setf (errormsg instance) "Error: invalid registration.")))))) (defclass users/register/submit-service (rest-service) ((location-p :initform nil)) @@ -187,10 +187,10 @@ :user_id (id user) :role_group_name role-group))) (delete-registration auth-pkg hash) - (setf (session-value :message) "Registration completed successfully.")) - (setf (session-value :errormsg) "Error while completing registration."))) - (setf (session-value :errormsg) "Error: passwords do not match.")) - (setf (session-value :errormsg) "Error while completing registration.")))))) + (setf (message instance) "Registration completed successfully.")) + (setf (errormsg instance) "Error while completing registration."))) + (setf (errormsg instance) "Error: passwords do not match.")) + (setf (errormsg instance) "Error while completing registration.")))))) (defclass users/modify-service (users/add-service) () @@ -217,7 +217,7 @@ (:name "phone" :label "Phone" :field-type "text" :value ,(phone user)) ,@(role-checkboxes "users_modify" role-groups active-role-groups) (:label "Modify User" :field-type "button" :onclick "on_users_modify_submit_clicked()")))) - (setf (session-value :errormsg) "Error: could not modify user. Not found.")))))) + (setf (errormsg instance) "Error: could not modify user. Not found.")))))) (defun users-modify-submit-json (id role_groups username first_name last_name email phone) (declare (special role_groups username first_name last_name email phone)) @@ -239,8 +239,8 @@ do (insert-user-role-group auth-pkg (make-instance 'user-role :user_id id :role_group_name role-group))) - (setf (session-value :message) "User saved successfully.")) - (setf (session-value :errormsg) "An error occured.")))))) + (setf (message instance) "User saved successfully.")) + (setf (errormsg instance) "An error occured.")))))) (defclass users/toggle-service (users/add-service) () @@ -253,12 +253,12 @@ (user (get-user-by-id auth-pkg id))) (if user (if (= (id user) (id (get-user))) - (setf (session-value :errormsg) "Error: you may not toggle your own active state.") + (setf (errormsg instance) "Error: you may not toggle your own active state.") (progn (user-toggle-active auth-pkg user) - (setf (session-value :errormsg) nil) - (setf (session-value :message) "User active state toggled successfully."))) - (setf (session-value :errormsg) "Error: could not toggle the active state of the user: not found.")))))) + (setf (errormsg instance) nil) + (setf (message instance) "User active state toggled successfully."))) + (setf (errormsg instance) "Error: could not toggle the active state of the user: not found.")))))) (defclass users/delete-service (users/add-service) () @@ -271,12 +271,12 @@ (user (get-user-by-id auth-pkg id))) (if user (if (= (id user) (id (get-user))) - (setf (session-value :errormsg) "Error: you may not delete yourself.") + (setf (errormsg instance) "Error: you may not delete yourself.") (progn (deactivate-user auth-pkg user) - (setf (session-value :errormsg) nil) - (setf (session-value :message) "User deleted successfully."))) - (setf (session-value :errormsg) "Error: could not delete user: not found.")))))) + (setf (errormsg instance) nil) + (setf (message instance) "User deleted successfully."))) + (setf (errormsg instance) "Error: could not delete user: not found.")))))) (define-endpoint ("/users" :method :get) () users-json) (define-endpoint ("/users/view" :method :get) () users-view-json) |