diff --git a/frontend/app/scripts/components/organisation/OrgUserListCmp.js b/frontend/app/scripts/components/organisation/OrgUserListCmp.js index 15f91da50f..dfaba897cb 100644 --- a/frontend/app/scripts/components/organisation/OrgUserListCmp.js +++ b/frontend/app/scripts/components/organisation/OrgUserListCmp.js @@ -18,6 +18,13 @@ this.onSort({field: field}); }; + self.addFilterValue = function(field, value) { + self.onFilter({ + field: field, + value: value + }); + } + self.reload = function() { self.onReload(); }; @@ -210,7 +217,8 @@ setPasswordEnabled: '<', onReload: '&', onEdit: '&', - onSort: '&' + onSort: '&', + onFilter: '&' } }); })(); diff --git a/frontend/app/views/components/org/user.list.html b/frontend/app/views/components/org/user.list.html index fa2727fb8b..ac7eb20dfd 100644 --- a/frontend/app/views/components/org/user.list.html +++ b/frontend/app/views/components/org/user.list.html @@ -36,9 +36,16 @@ Password API Key MFA - + + Dates + + C. + + + + - Updated At + U. @@ -105,7 +112,14 @@ - {{user._updatedAt | shortDate}} + +
+ C. {{user._createdAt | shortDate}} +
+
+ U. {{user._updatedAt | shortDate}} +
+ diff --git a/frontend/app/views/partials/admin/organisation/details.html b/frontend/app/views/partials/admin/organisation/details.html index 8a821a29c6..2407dc9dda 100644 --- a/frontend/app/views/partials/admin/organisation/details.html +++ b/frontend/app/views/partials/admin/organisation/details.html @@ -108,6 +108,7 @@

on-reload="$vm.loadUsers()" on-edit="$vm.showUserDialog(user)" on-sort="$vm.sortByField(field)" + on-filter="$vm.addFilterValue(field, value)" sort="$vm.filtering.context.sort" set-password-enabled="$vm.canSetPass" mfa-enabled="$vm.canChangeMfa">