diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee index 438de4943f6..5b885bae5da 100644 --- a/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee +++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee @@ -92,6 +92,7 @@ Template.membersList.helpers username: Template.instance().userDetail.get() clear: Template.instance().clearUserDetail showAll: room?.t in ['c', 'p'] + hideAdminControls: room?.t in ['c', 'p', 'd'] video: room?.t in ['d'] } diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html index 6c6e528b09e..38d4abfaa34 100644 --- a/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html +++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html @@ -73,26 +73,28 @@ {{/if}} {{/if}} - {{#if hasPermission 'edit-other-user-info'}} - - {{/if}} - {{#if hasPermission 'assign-admin-role'}} - {{#if hasAdminRole}} - - {{else}} - + {{#unless hideAdminControls}} + {{#if hasPermission 'edit-other-user-info'}} + {{/if}} - {{/if}} - {{#if hasPermission 'edit-other-user-active-status'}} - {{#if active}} - - {{else}} - + {{#if hasPermission 'assign-admin-role'}} + {{#if hasAdminRole}} + + {{else}} + + {{/if}} {{/if}} - {{/if}} - {{#if hasPermission 'delete-user'}} - - {{/if}} + {{#if hasPermission 'edit-other-user-active-status'}} + {{#if active}} + + {{else}} + + {{/if}} + {{/if}} + {{#if hasPermission 'delete-user'}} + + {{/if}} + {{/unless}} {{#if showAll}}