From 30d0130e79bfae1314f57faa0550ff2cfc758698 Mon Sep 17 00:00:00 2001 From: Vismay Golwala Date: Mon, 15 Apr 2019 16:56:37 -0400 Subject: [PATCH] Show only member users for organization Signed-off-by: Vismay Golwala --- .../src/organizations/organizations.form.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/organizations/organizations.form.js b/awx/ui/client/src/organizations/organizations.form.js index a00770f7ba..db53cb63cf 100644 --- a/awx/ui/client/src/organizations/organizations.form.js +++ b/awx/ui/client/src/organizations/organizations.form.js @@ -93,7 +93,7 @@ export default ['NotificationsList', 'i18n', name: 'users', dataPlacement: 'top', awToolTip: i18n._('Please save before adding users.'), - basePath: 'api/v2/organizations/{{$stateParams.organization_id}}/access_list/', + basePath: 'api/v2/organizations/{{$stateParams.organization_id}}/users/', search: { order_by: 'username' }, @@ -118,13 +118,15 @@ export default ['NotificationsList', 'i18n', key: true, label: i18n._('User'), linkBase: 'users', - columnClass: 'col-sm-6' + columnClass: 'col-sm-4' }, - role: { - label: i18n._('Role'), - type: 'role', - nosort: true, - columnClass: 'col-sm-6' + first_name: { + label: i18n._('First name'), + columnClass: 'col-sm-4' + }, + last_name: { + label: i18n._('Last name'), + columnClass: 'col-sm-4' } } },