Merge pull request #494 from droberts-ctrlo/notes-field-fix

Fix for user notes not persisting when saving users [B: 1736]
ctrlo · Dec 5, 2024 · 6ee13ac · 6ee13ac
2 parents 44d7f03 + 3c902a7
commit 6ee13ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/GADS/API.pm b/lib/GADS/API.pm
@@ -752,7 +752,7 @@ sub _post_add_user_account
         department_id         => $body->{department_id},
         team_id               => $body->{team_id},
         account_request       => 0,
-        account_request_notes => $body->{notes},
+        account_request_notes => $body->{notes} || $body->{account_request_notes},
         view_limits           => $body->{view_limits},
         groups                => $body->{groups},
     );

diff --git a/src/frontend/components/modal/modals/user/lib/component.js b/src/frontend/components/modal/modals/user/lib/component.js
@@ -62,8 +62,8 @@ class UserModalComponent extends ModalComponent {
             data[$(field).attr('name')] = fieldValue
           }
         }
-      } else if ($(field).val() !== '') {
-        const fieldValue = $(field).val()
+      } else if ($(field).val()|| $(field).value) {
+        const fieldValue = $(field).val() || $(field).value
         const fieldParsedValue = isNaN(fieldValue) ? this.parseValue(fieldValue) : parseInt(fieldValue)
         if (Array.isArray(data[$(field).attr('name')])) {
           data[$(field).attr('name')].push(fieldParsedValue)