From 9f5fb98b751d33d13c5fa2242054f829f5eb8be0 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 4 Jul 2017 04:06:18 -0400
Subject: Fix system admin not seeing manage channel members options (#6831)

---
 .../channel_members_dropdown.jsx                   | 56 +++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'webapp/components/channel_members_dropdown')

diff --git a/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx b/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
index 1deabb0d3..f8ff3a4f6 100644
--- a/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
+++ b/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
@@ -189,37 +189,35 @@ export default class ChannelMembersDropdown extends React.Component {
                 );
             }
 
-            if (!makeChannelMember || !makeChannelAdmin || !removeFromChannel) {
+            if ((makeChannelMember || makeChannelAdmin) && removeFromChannel) {
                 return (
-                    <div/>
+                    <div className='dropdown member-drop'>
+                        <a
+                            id='channelMemberDropdown'
+                            href='#'
+                            className='dropdown-toggle theme'
+                            type='button'
+                            data-toggle='dropdown'
+                            aria-expanded='true'
+                        >
+                            <span>{role} </span>
+                            <span className='fa fa-chevron-down'/>
+                        </a>
+                        <ul
+                            className='dropdown-menu member-menu'
+                            role='menu'
+                        >
+                            {makeChannelMember}
+                            {makeChannelAdmin}
+                            {removeFromChannel}
+                        </ul>
+                        {serverError}
+                    </div>
                 );
             }
+        }
 
-            return (
-                <div className='dropdown member-drop'>
-                    <a
-                        id='channelMemberDropdown'
-                        href='#'
-                        className='dropdown-toggle theme'
-                        type='button'
-                        data-toggle='dropdown'
-                        aria-expanded='true'
-                    >
-                        <span>{role} </span>
-                        <span className='fa fa-chevron-down'/>
-                    </a>
-                    <ul
-                        className='dropdown-menu member-menu'
-                        role='menu'
-                    >
-                        {makeChannelMember}
-                        {makeChannelAdmin}
-                        {removeFromChannel}
-                    </ul>
-                    {serverError}
-                </div>
-            );
-        } else if (this.canRemoveMember() && this.props.channel.name !== Constants.DEFAULT_CHANNEL) {
+        if (this.canRemoveMember() && this.props.channel.name !== Constants.DEFAULT_CHANNEL) {
             return (
                 <button
                     id='removeMember'
@@ -233,7 +231,9 @@ export default class ChannelMembersDropdown extends React.Component {
                     />
                 </button>
             );
-        } else if (isChannelAdmin) {
+        }
+
+        if (isChannelAdmin) {
             if (this.props.channel.name === Constants.DEFAULT_CHANNEL) {
                 return (
                     <div/>
-- 
cgit v1.2.3-1-g7c22