more react migration

1 files changed, 9 insertions, 9 deletions

diff --git a/lisp/service/users-service.lisp b/lisp/service/users-service.lisp
index 556ea7f..965fee6 100644
--- a/lisp/service/users-service.lisp
+++ b/lisp/service/users-service.lisp
@@ -35,7 +35,7 @@
          :accessor form))
   (:documentation ""))
 
-(defun role-checkboxes (role-groups &optional active-role-groups)
+(defun role-checkboxes (name role-groups &optional active-role-groups)
   (remove-if 'null
              (mapcar (lambda (role-group)
                        (when (not (intersection `(,(name role-group)) `("_Public" "profile-admin") :test 'string=))
@@ -45,7 +45,7 @@
                                                                     active-role-groups)
                                                             :test 'string=)
                                           '(:checked "checked" :value "on"))))
-                           (remove-if 'null `(:name ,(format nil "chk_~a" (name role-group)) :label ,(name role-group) :field-type "checkbox" ,@checked)))))
+                           (remove-if 'null `(:name ,(format nil "chk_~a_~a" name (name role-group)) :label ,(name role-group) :field-type "checkbox" ,@checked)))))
                      role-groups)))
 
 (defun users-add-json ()
@@ -61,7 +61,7 @@
                                          `((:name "first_name" :label "First Name" :field-type "text" :required "required")
                                            (:name "last_name" :label "Last Name" :field-type "text" :required "required")
                                            (:name "email" :label "Email" :field-type "text" :required "required")
-                                           ,@(role-checkboxes role-groups)
+                                           ,@(role-checkboxes "users_add" role-groups)
                                            (:label "Add User" :field-type "button" :onclick "on_users_add_submit_clicked()"))))))))
 
 (defun users-add-submit-json (role_groups first_name last_name email)
@@ -76,7 +76,7 @@
           (setf registration (get-registration-by-id auth-pkg id)))
         (handler-case
             (let ((text-message (format nil
-                                        "Hello ~a ~a and welcome to the ~a website!~%~%A user account registration has been created for you. It expires in 3 days.~%~%Please click the following link to complete the registration:~%~%~a://~a/register?hash=~a~%"
+                                        "Hello ~a ~a and welcome to the ~a website!~%~%A user account registration has been created for you. It expires in 3 days.~%~%Please click the following link to complete the registration:~%~%~a://~a/register/~a~%"
                                         (name *webapp*)
                                         (first_name registration)
                                         (last_name registration)
@@ -95,12 +95,12 @@
                                    ((p) "Please click the following link to complete the registration:")
                                    ((p)
                                     ((a :href ,(format nil
-                                                       "~a://~a/register?hash=~a"
+                                                       "~a://~a/register/~a"
                                                        (scheme *webapp*)
                                                        (url *webapp*)
                                                        (hash registration)))
                                      ,(format nil
-                                              "~a://~a/register?hash=~a"
+                                              "~a://~a/register/~a"
                                               (scheme *webapp*)
                                               (url *webapp*)
                                               (hash registration))))))))
@@ -218,7 +218,7 @@
                                                (:name "last_name" :label "Last Name" :field-type "text" :value ,(last_name user) :required "required")
                                                (:name "email" :label "Email" :field-type "text" :value ,(email user) :required "required")
                                                (:name "phone" :label "Phone" :field-type "text" :value ,(phone user))
-                                               ,@(role-checkboxes role-groups active-role-groups)
+                                               ,@(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."))))))
 
@@ -240,7 +240,7 @@
                                              (cl-ppcre:split "\\|" role_groups)
                                              :test 'string=)
                     do (insert-user-role-group auth-pkg (make-instance 'user-role
-                                                                       :user_id (id user)
+                                                                       :user_id id
                                                                        :role_group_name role-group)))
               (setf (session-value :message) "User saved successfully."))
             (setf (session-value :errormsg) "An error occured."))))))
@@ -285,7 +285,7 @@
 (define-endpoint ("/users/view" :method :get) () users-view-json)
 (define-endpoint ("/users/add" :method :post) () users-add-json)
 (define-endpoint ("/users/add/submit" :method :post) (&post (role_groups :parameter-type 'string) (first_name :parameter-type 'string) (last_name :parameter-type 'string) (email :parameter-type 'string)) users-add-submit-json role_groups first_name last_name email)
-(define-endpoint ("/register/:hash" :method :get) (&path (hash 'string)) base (format nil "/register/~a" hash))
+(define-endpoint ("/register" :method :get) (&get (hash :parameter-type 'string)) base (format nil "/register/~a" hash))
 (define-endpoint ("/users/register" :method :post) (&post (hash :parameter-type 'string)) users-register-json hash)
 (define-endpoint ("/users/register/form" :method :post) (&post (hash :parameter-type 'string)) users-register-form-json hash)
 (define-endpoint ("/users/register/submit" :method :post) (&post (hash :parameter-type 'string) (username :parameter-type 'string) (pwd :parameter-type 'string) (pwd2 :parameter-type 'string) (phone :parameter-type 'string)) users-register-submit-json hash username pwd pwd2 phone)