Fixed thesisgraders

UniversityOfHelsinkiCS · Aug 22, 2017 · d57be2c · d57be2c
1 parent 7c94ce3
commit d57be2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/thesis/ThesisCreatePage.jsx b/src/thesis/ThesisCreatePage.jsx
@@ -74,8 +74,8 @@ export class ThesisCreatePage extends Component {
           <ThesisInformation errors={this.state.newThesis.errors} thesis={this.state.newThesis.values} sendChange={this.handleChange} studyFields={this.props.StudyFields} editing />
           <h3 className="ui dividing header">Upload Thesis files</h3>
           <ThesisUploadWidget errors={this.state.newThesis.errors} sendChange={this.handleChange} currentFile={this.state.newThesis.values.PdfFile.name} type={"newThesisReview"} />
-          <ThesisGraders errors={this.state.newThesis.errors} graders={this.props.Graders} alreadySelected={this.state.newThesis.values.Graders} editing={true}/>
-          {isAdmin ? <GraderListCreateUpdate editable /> : ''}
+          <ThesisGraders errors={this.state.newThesis.errors} updateOrNew={"newThesis"} graders={this.props.Graders} alreadySelected={this.state.newThesis.values.Graders} editing={true}/>
+          <GraderListCreateUpdate editable />
           <ThesisCouncilMeetingPicker errors={this.state.newThesis.errors} councilMeetings={this.props.CouncilMeetings} sendChange={this.handleChange} editing={true} />
         </div>
         <button className="ui primary button" onClick={this.toggleModal}>

diff --git a/src/thesis/ThesisEditPage.jsx b/src/thesis/ThesisEditPage.jsx
@@ -229,8 +229,8 @@ export class ThesisEditPage extends Component {
                 <ThesisInformation errors={this.state.updateThesis.errors} thesis={this.state.updateThesis.values} sendChange={this.handleChange} studyFields={this.props.studyfields} editing={this.state.editing} />
                 {this.renderThesisFileButtons()}
                 {this.state.editing ? this.renderThesisUploadFiles() : ""}
-                <ThesisGraders errors={this.state.updateThesis.errors} graders={this.props.Graders} alreadySelected={this.state.updateThesis.values.Graders} editing={this.state.editing} />
-                {this.state.editing ? <GraderListCreateUpdate editable /> : ""}
+                <ThesisGraders errors={this.state.updateThesis.errors} updateOrNew={"updateThesis"} graders={this.props.Graders} alreadySelected={this.state.updateThesis.values.Graders} editing={this.state.editing} />
+                <GraderListCreateUpdate editable />
                 <ThesisCouncilMeetingPicker errors={this.state.updateThesis.errors} councilMeetings={this.props.councilmeetings} sendChange={this.handleChange} />
                 {this.renderGraderEval()}
                 {this.props.user.role === "admin" ? <ThesisEmails thesisProgress={this.state.updateThesis.values.ThesisProgress} sendEmail={this.handleEmail} sendDone={this.setReminderDone} /> : ""}

diff --git a/src/thesis/components/ThesisGraders.jsx b/src/thesis/components/ThesisGraders.jsx
@@ -11,7 +11,7 @@ export class ThesisGraders extends Component {
                 <p>Click to open a drop-down menu or to type into the input for search.</p>
                 <div className="field">
                     <label>Select Graders</label>
-                    <GradersDropdown formname="newThesis" graders={this.props.graders}
+                    <GradersDropdown formname={this.props.updateOrNew} graders={this.props.graders}
                         selected={this.props.alreadySelected} editable={this.props.editing} />
                 </div>
                 <ValidateError errors={this.props.errors} model="thesis" field="Graders" />