Merge pull request #6804 from vlogic/5110

Missing useful fields in admin user list #5110

packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json

@@ -268,8 +268,8 @@
       "from": "generate-object-property@>=1.1.0 <2.0.0"
     },
     "getpass": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "from": "getpass@>=0.1.1 <0.2.0",
       "dependencies": {
         "assert-plus": {

packages/rocketchat-ui-admin/client/users/adminUsers.html

@@ -29,6 +29,8 @@
 									<th class="content-background-color border-component-color" width="34%">{{_ "Name"}}</th>
 									<th class="content-background-color border-component-color" width="33%">{{_ "Username"}}</th>
 									<th class="content-background-color border-component-color" width="33%">{{_ "Email"}}</th>
+									<th class="content-background-color border-component-color" width="33%">{{_ "Roles"}}</th>
+									<th class="content-background-color border-component-color" width="33%">{{_ "Status"}}</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -42,10 +44,13 @@
 									<td class="border-component-color">{{name}}</td>
 									<td class="border-component-color">{{username}}</td>
 									<td class="border-component-color">{{emailAddress}}</td>
+									<td class="border-component-color">{{roles}}</td>
+									<td class="border-component-color">{{status}}</td>
 								</tr>
 								{{/each}}
 							</tbody>
 						</table>
+
 						{{#if hasMore}}
 							<button class="button secondary load-more {{isLoading}}">{{_ "Load_more"}}</button>
 						{{/if}}
@@ -58,3 +63,4 @@
 		{{/with}}
 	</div>
 </template>
+