itizawa 6 лет назад
Родитель
Сommit
64d091d89c

+ 0 - 5
src/client/js/components/Admin/Users/InviteUserControl.jsx

@@ -19,7 +19,6 @@ class InviteUserControl extends React.Component {
 
     this.toggleUserInviteModal = this.toggleUserInviteModal.bind(this);
     this.showConfirmPasswordModal = this.showConfirmPasswordModal.bind(this);
-    this.onCloseConfirmPasswordModal = this.onCloseConfirmPasswordModal.bind(this);
   }
 
   /**
@@ -34,10 +33,6 @@ class InviteUserControl extends React.Component {
     this.setState({ isConfirmPassWordModalShown: true });
   }
 
-  onCloseConfirmPasswordModal() {
-    this.setState({ isConfirmPassWordModalShown: false });
-  }
-
   render() {
     const { t } = this.props;
 

+ 38 - 22
src/client/js/components/Admin/Users/UserInviteModal.jsx

@@ -121,7 +121,6 @@ class UserInviteModal extends React.Component {
               <>
                 <p>{t('user_management.temporary_password')}</p>
                 <p>{t('user_management.send_new_password')}</p>
-                <p className="text-danger">{t('user_management.send_temporary_password')}</p>
                 {invitedEmailList.createdUserList.length > 0 && this.renderCreatedEmail(invitedEmailList.createdUserList)}
                 {invitedEmailList.existingEmailList.length > 0 && this.renderExistingEmail(invitedEmailList.existingEmailList)}
               </>
@@ -129,27 +128,44 @@ class UserInviteModal extends React.Component {
           }
         </Modal.Body>
         <Modal.Footer className="d-flex">
-          <label className="mr-3 text-left" style={{ flex: 1 }}>
-            <input
-              type="checkbox"
-              defaultChecked={this.state.sendEmail}
-              onChange={this.handleCheckBox}
-            />
-            <span className="ml-2">{ t('user_management.invite_thru_email') }</span>
-          </label>
-          <div>
-            <Button bsStyle="danger" className="fcbtn btn btn-xs btn-danger btn-outline btn-rounded" onClick={this.props.onToggleModal}>
-              Cancel
-            </Button>
-            <Button
-              bsStyle="primary"
-              className="fcbtn btn btn-primary btn-outline btn-rounded btn-1b"
-              onClick={this.handleSubmit}
-              disabled={!this.validEmail()}
-            >
-              Done
-            </Button>
-          </div>
+          {invitedEmailList == null ? (
+            <>
+              <label className="mr-3 text-left" style={{ flex: 1 }}>
+                <input
+                  type="checkbox"
+                  defaultChecked={this.state.sendEmail}
+                  onChange={this.handleCheckBox}
+                />
+                <span className="ml-2">{ t('user_management.invite_thru_email') }</span>
+              </label>
+              <div>
+                <Button bsStyle="danger" className="fcbtn btn btn-xs btn-danger btn-outline btn-rounded" onClick={this.props.onToggleModal}>
+                  Cancel
+                </Button>
+                <Button
+                  bsStyle="primary"
+                  className="fcbtn btn btn-primary btn-outline btn-rounded btn-1b"
+                  onClick={this.handleSubmit}
+                  disabled={!this.validEmail()}
+                >
+                  Done
+                </Button>
+              </div>
+            </>
+          ) : (
+            <>
+              <label className="mr-3 text-left text-danger" style={{ flex: 1 }}>
+                {t('user_management.send_temporary_password')}
+              </label>
+              <Button
+                bsStyle="primary"
+                className="fcbtn btn btn-primary btn-outline btn-rounded"
+                onClick={this.props.onToggleModal}
+              >
+              Close
+              </Button>
+            </>
+          )}
         </Modal.Footer>
       </Modal>
     );