Merge pull request #490 from FitzwilliamMuseum/issue471

Fix researcher profile
FitzwilliamMuseum · Aug 22, 2022 · e3395a0 · e3395a0
2 parents 1f392c7 + edeef6f
commit e3395a0
Show file tree

Hide file tree

Showing 2 changed files with 208 additions and 191 deletions.
diff --git a/app/Models/StaffProfiles.php b/app/Models/StaffProfiles.php
@@ -29,7 +29,8 @@ public static function list(Request $request): LengthAwarePaginator
                 'limit' => $perPage,
                 'offset' => $offset,
                 'sort' => 'last_name',
-                'filter[research_active][in]' => 'yes'
+                'filter[research_active][in]' => 'yes',
+                'filter[employment_status][in]' => 'employed',
             )
         );
         $staff = $api->getData();
@@ -63,7 +64,8 @@ public static function allstaff(Request $request): LengthAwarePaginator
                 'offset' => $offset,
                 'meta' => '*',
                 'sort' => 'last_name',
-                'filter[status][in]' => 'published'
+                'filter[status][in]' => 'published',
+                'filter[employment_status][in]' => 'employed',
             )
         );
         $staff = $directus->getData();