Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions keepercommander/commands/enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ def tree_node(node):
user_teams[enterprise_user_id].add(team_uid)

displayed_columns = [x for x in supported_columns if x in columns]
is_verbose = kwargs.get('verbose') or False
rows = []
for u in users.values():
user_status_dict = get_user_status_dict(u)
Expand All @@ -796,12 +797,19 @@ def tree_node(node):
elif column == 'transfer_status':
row.append(user_status_dict['acct_transfer_status'])
elif column == 'node':
row.append(self.get_node_path(params, u['node_id']))
if is_verbose:
row.append(str(u['node_id']))
else:
row.append(self.get_node_path(params, u['node_id']))
elif column == 'team_count':
row.append(len([1 for t in teams.values() if t['users'] and user_id in t['users']]))
elif column == 'teams':
team_names = [t["name"] for t in teams.values() if t['users'] and user_id in t['users']]
row.append(team_names)
user_team_list = [t for t in teams.values()
if t['users'] and user_id in t['users']]
if is_verbose:
row.append([t['id'] for t in user_team_list])
else:
row.append([t['name'] for t in user_team_list])
elif column == 'role_count' or column == 'roles':
role_ids = set()
if user_id in user_roles:
Expand All @@ -813,8 +821,11 @@ def tree_node(node):
if column == 'role_count':
row.append(len(role_ids))
else:
role_names = [roles[role_id]['name'] for role_id in role_ids if role_id in roles]
row.append(role_names)
if is_verbose:
row.append([str(role_id) for role_id in role_ids if role_id in roles])
else:
role_names = [roles[role_id]['name'] for role_id in role_ids if role_id in roles]
row.append(role_names)
elif column == 'alias':
row.append([x['username'] for x in params.enterprise.get('user_aliases', [])
if x['enterprise_user_id'] == user_id and x['username'] != email])
Expand Down
Loading