fix member button bugs and let category dropdown search in past block…

… of attendee update page, and minor label changes
xjlin0 · Apr 5, 2024 · f8c6282 · f8c6282
1 parent cf64595
commit f8c6282
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 43 deletions.
diff --git a/attendees/static/js/persons/attendee_update_view.js b/attendees/static/js/persons/attendee_update_view.js
@@ -371,7 +371,7 @@ Attendees.datagridUpdate = {
       {
         colSpan: 24,
         colCount: 24,
-        caption: 'Add the new member to a family?',
+        caption: 'Add the new person to a family?',
         cssClass: 'h6 not-shrinkable leading-checkbox',
         itemType: 'group',
         items: [
@@ -3726,11 +3726,10 @@ Attendees.datagridUpdate = {
           dataSource: {
             store: new DevExpress.data.CustomStore({
               key: 'id',
-              load: () => {
-                return $.getJSON(Attendees.datagridUpdate.attendeeAttrs.dataset.categoriesEndpoint, {
-                  take: 999,
-                  type: args.type,
-                });
+              load: (searchOpts) => {
+                searchOpts['take'] = 999;
+                searchOpts['type'] = args.type;
+                return $.getJSON(Attendees.datagridUpdate.attendeeAttrs.dataset.categoriesEndpoint, searchOpts);
               },
               byKey: (key) => {
                 const d = new $.Deferred();
@@ -3742,6 +3741,8 @@ Attendees.datagridUpdate = {
               },
             }),
           },
+
+
         },
       },
       {

diff --git a/fixtures/db_seed.json b/fixtures/db_seed.json
@@ -10030,42 +10030,6 @@
       }
     }
   },
-  {
-    "model": "persons.attendee",
-    "pk": "761d8788-47af-4414-bdc7-ca8ac96f0207",
-    "fields": {
-      "created": "2023-05-17T13:30:25.013Z",
-      "modified": "2023-05-17T13:30:25.013Z",
-      "is_removed": false,
-      "division": 1,
-      "user": null,
-      "first_name": "rr",
-      "last_name": "rrr",
-      "first_name2": "",
-      "last_name2": "",
-      "gender": "MALE",
-      "actual_birthday": null,
-      "estimated_birthday": null,
-      "deathday": null,
-      "photo": "",
-      "infos": {
-        "fixed": {
-          "mobility": 2
-        },
-        "names": {
-          "original": "rr rrr",
-          "simplified": "rr rrr",
-          "traditional": "rr rrr",
-          "romanization": "rr rrr"
-        },
-        "contacts": {},
-        "schedulers": {},
-        "progressions": {},
-        "emergency_contacts": {},
-        "updating_attendees": {}
-      }
-    }
-  },
   {
     "model": "persons.attendee",
     "pk": "786a9d44-379f-4671-9004-5b3d0bd0227b",
@@ -15974,7 +15938,7 @@
         "gathering_infos": {},
         "default_time_zone": "America/Los_Angeles",
         "automatic_creation": {
-          "Past": 5,
+          "Past": 37,
           "Gathering": null,
           "Attendance": null
         },