From 3db6794201ffc646a461fd348ddb359d82f809c2 Mon Sep 17 00:00:00 2001
From: Alex Brazier <aejbrazier@gmail.com>
Date: Sat, 23 Jul 2016 13:45:45 +0100
Subject: [PATCH] Hide user admin controls except for in admin panel closes
 #3847

---
 .../flex-tab/tabs/membersList.coffee          |  1 +
 .../flex-tab/tabs/userInfo.html               | 38 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

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'}}
-				<button class='button lightblue edit-user button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
-				{{/if}}
-				{{#if hasPermission 'assign-admin-role'}}
-					{{#if hasAdminRole}}
-					<button class='button lightblue remove-admin button-block'><span><i class='icon-shield'></i> {{_ "Remove_Admin"}}</span></button>
-					{{else}}
-					<button class='button lightblue make-admin button-block'><span><i class='icon-shield'></i> {{_ "Make_Admin"}}</span></button>
+				{{#unless hideAdminControls}}
+					{{#if hasPermission 'edit-other-user-info'}}
+					<button class='button lightblue edit-user button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
 					{{/if}}
-				{{/if}}
-				{{#if hasPermission 'edit-other-user-active-status'}}
-					{{#if active}}
-					<button class='button deactivate button-block'><span><i class='icon-block'></i> {{_ "Deactivate"}}</span></button>
-					{{else}}
-					<button class='button activate button-block'><span><i class='icon-ok-circled'></i> {{_ "Activate"}}</span></button>
+					{{#if hasPermission 'assign-admin-role'}}
+						{{#if hasAdminRole}}
+						<button class='button lightblue remove-admin button-block'><span><i class='icon-shield'></i> {{_ "Remove_Admin"}}</span></button>
+						{{else}}
+						<button class='button lightblue make-admin button-block'><span><i class='icon-shield'></i> {{_ "Make_Admin"}}</span></button>
+						{{/if}}
 					{{/if}}
-				{{/if}}
-				{{#if hasPermission 'delete-user'}}
-				<button class='button delete red button-block'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
-				{{/if}}
+					{{#if hasPermission 'edit-other-user-active-status'}}
+						{{#if active}}
+						<button class='button deactivate button-block'><span><i class='icon-block'></i> {{_ "Deactivate"}}</span></button>
+						{{else}}
+						<button class='button activate button-block'><span><i class='icon-ok-circled'></i> {{_ "Activate"}}</span></button>
+						{{/if}}
+					{{/if}}
+					{{#if hasPermission 'delete-user'}}
+					<button class='button delete red button-block'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
+					{{/if}}
+				{{/unless}}
 
 				{{#if showAll}}
 					<button class='button secondary back'><span>{{_ "View_All"}} <i class='icon-angle-right'></i></span></button>