Merge pull request #5812 from driusan/Release21To22

Branch Merge of 21.0 to 22.0
aces · Nov 29, 2019 · 7e5a051 · 7e5a051
2 parents 646687f + 1895376
commit 7e5a051
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/jsx/Form.js b/jsx/Form.js
@@ -1614,6 +1614,7 @@ class ButtonElement extends Component {
             type={this.props.type}
             className={this.props.buttonClass}
             onClick={this.handleClick}
+            disabled={this.props.disabled}
           >
             {this.props.label}
           </button>
@@ -1627,12 +1628,14 @@ ButtonElement.propTypes = {
   name: PropTypes.string,
   label: PropTypes.string,
   type: PropTypes.string,
+  disabled: PropTypes.bool,
   onUserInput: PropTypes.func,
 };
 
 ButtonElement.defaultProps = {
   label: 'Submit',
   type: 'submit',
+  disabled: null,
   buttonClass: 'btn btn-primary',
   columnSize: 'col-sm-9 col-sm-offset-3',
   onUserInput: function() {

diff --git a/modules/candidate_list/jsx/candidateListIndex.js b/modules/candidate_list/jsx/candidateListIndex.js
@@ -125,7 +125,7 @@ class CandidateListIndex extends Component {
 
     if (column === 'Subproject') {
       // If user has multiple subprojects, join array into string
-      let result = (cell) ? <td>{cell.join(', ')}</td> : null;
+      let result = (cell) ? <td>{cell.join(', ')}</td> : <td></td>;
       return result;
     }
 

diff --git a/modules/login/php/requestaccount.class.inc b/modules/login/php/requestaccount.class.inc
@@ -144,9 +144,9 @@ class RequestAccount extends \NDB_Form
     function _process($values)
     {
         $DB       = \Database::singleton();
-        $name     = htmlspecialchars($_REQUEST["firstname"], ENT_QUOTES);
-        $lastname = htmlspecialchars($_REQUEST["lastname"], ENT_QUOTES);
-        $from     = htmlspecialchars($_REQUEST["from"], ENT_QUOTES);
+        $name     = trim(htmlspecialchars($_REQUEST["firstname"], ENT_QUOTES));
+        $lastname = trim(htmlspecialchars($_REQUEST["lastname"], ENT_QUOTES));
+        $from     = trim(htmlspecialchars($_REQUEST["from"], ENT_QUOTES));
         $site     = $_REQUEST["site"];
         $fullname = $name." ".$lastname;
 

diff --git a/modules/new_profile/jsx/NewProfileIndex.js b/modules/new_profile/jsx/NewProfileIndex.js
@@ -19,6 +19,7 @@ class NewProfileIndex extends React.Component {
       isLoaded: false,
       isCreated: false,
       error: false,
+      submitDisabled: false,
     };
     this.handleSubmit = this.handleSubmit.bind(this);
     this.setFormData = this.setFormData.bind(this);
@@ -88,6 +89,9 @@ class NewProfileIndex extends React.Component {
       }
       formObject.append('fire_away', 'New Candidate');
 
+      // disable button to prevent form resubmission.
+      this.setState({submitDisabled: true});
+
       fetch(this.props.submitURL, {
         method: 'POST',
         cache: 'no-cache',
@@ -102,6 +106,8 @@ class NewProfileIndex extends React.Component {
           });
         } else {
           resp.json().then((message) => {
+            // enable button for form resubmission.
+            this.setState({submitDisabled: false});
             swal.fire('Error!', message, 'error');
           });
         }
@@ -239,6 +245,7 @@ class NewProfileIndex extends React.Component {
             label = "Create"
             id = "button"
             type = "submit"
+            disabled={this.state.submitDisabled}
           />
         </FormElement>
       );