Shun Miyazawa %!s(int64=4) %!d(string=hai) anos
pai
achega
1f7d85ec82
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      src/client/js/components/Admin/Users/UserMenu.jsx

+ 4 - 4
src/client/js/components/Admin/Users/UserMenu.jsx

@@ -7,7 +7,7 @@ import {
 
 import StatusActivateButton from './StatusActivateButton';
 import StatusSuspendedButton from './StatusSuspendedButton';
-import RemoveUserButton from './UserRemoveButton';
+import UserRemoveButton from './UserRemoveButton';
 import RemoveAdminButton from './RemoveAdminButton';
 import GiveAdminButton from './GiveAdminButton';
 import SendInvitationEmailButton from './SendInvitationMailButton';
@@ -58,8 +58,8 @@ class UserMenu extends React.Component {
         <li>
           {(user.status === 1 || user.status === 3) && <StatusActivateButton user={user} />}
           {user.status === 2 && <StatusSuspendedButton user={user} />}
-          {(!user.isInvitationEmailSended && user.status === 5) && <SendInvitationEmailButton user={user} />}
-          {(user.status === 1 || user.status === 3 || user.status === 5) && <RemoveUserButton user={user} />}
+          {(user.status === 5 && !user.isInvitationEmailSended) && <SendInvitationEmailButton user={user} />}
+          {(user.status === 1 || user.status === 3 || user.status === 5) && <UserRemoveButton user={user} />}
         </li>
       </Fragment>
     );
@@ -87,7 +87,7 @@ class UserMenu extends React.Component {
       <UncontrolledDropdown id="userMenu" size="sm">
         <DropdownToggle caret color="secondary" outline>
           <i className="icon-settings" />
-          {(!user.isInvitationEmailSended && user.status === 5) && <i className="fa fa-circle text-danger grw-usermenu-notification-icon" />}
+          {(user.status === 5 && !user.isInvitationEmailSended) && <i className="fa fa-circle text-danger grw-usermenu-notification-icon" />}
         </DropdownToggle>
         <DropdownMenu positionFixed>
           {this.renderEditMenu()}