diff --git a/contentcuration/contentcuration/frontend/administration/composables/useTable.js b/contentcuration/contentcuration/frontend/administration/composables/useTable.js index 7039723941..76a1d98d01 100644 --- a/contentcuration/contentcuration/frontend/administration/composables/useTable.js +++ b/contentcuration/contentcuration/frontend/administration/composables/useTable.js @@ -115,5 +115,6 @@ export function useTable({ fetchFunc, filterFetchQueryParams }) { return { pagination, loading, + loadItems, }; } diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue index b447dc01ca..cc40a870da 100644 --- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue +++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue @@ -113,6 +113,7 @@ diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue index f7fdf07722..b99234b265 100644 --- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue +++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue @@ -123,6 +123,7 @@ @@ -246,7 +247,7 @@ return store.dispatch('userAdmin/loadUsers', fetchParams); } - const { pagination, loading } = useTable({ + const { pagination, loading, loadItems } = useTable({ fetchFunc: fetchParams => loadUsers(fetchParams), filterFetchQueryParams, }); @@ -261,6 +262,7 @@ clearSearch, pagination, loading, + loadItems, filterFetchQueryParams, }; }, diff --git a/contentcuration/contentcuration/viewsets/user.py b/contentcuration/contentcuration/viewsets/user.py index bbd2389ee5..806e5a69c8 100644 --- a/contentcuration/contentcuration/viewsets/user.py +++ b/contentcuration/contentcuration/viewsets/user.py @@ -431,7 +431,7 @@ class AdminUserViewSet( "edit_count", "view_count", ) - queryset = User.objects.all() + queryset = User.objects.filter(deleted=False) def annotate_queryset(self, queryset): edit_channel_query = (