Merge pull request #140 from UniversityOfHelsinkiCS/22.8-hotfixes

Correct permissions to adding graders
UniversityOfHelsinkiCS · Aug 22, 2017 · d74bb50 · d74bb50
2 parents 097bf7e + c7b5e67
commit d74bb50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/thesis/ThesisCreatePage.jsx b/src/thesis/ThesisCreatePage.jsx
@@ -66,6 +66,7 @@ export class ThesisCreatePage extends Component {
   */
   render() {
     const isAdmin = this.props.user.role === "admin";
+    const isProfessor = this.props.user.role.includes("Prof");
     return (
       <div>
         <ThesisConfirmModal sendAddThesis={this.handleAddThesis} closeModal={this.toggleModal} showModal={this.state.showModal} />
@@ -75,7 +76,7 @@ export class ThesisCreatePage extends Component {
           <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} updateOrNew={"newThesis"} graders={this.props.Graders} alreadySelected={this.state.newThesis.values.Graders} editing={true}/>
-          <GraderListCreateUpdate editable />
+          {isProfessor || isAdmin ? <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
@@ -230,7 +230,7 @@ export class ThesisEditPage extends Component {
                 {this.renderThesisFileButtons()}
                 {this.state.editing ? this.renderThesisUploadFiles() : ""}
                 <ThesisGraders errors={this.state.updateThesis.errors} updateOrNew={"updateThesis"} graders={this.props.Graders} alreadySelected={this.state.updateThesis.values.Graders} editing={this.state.editing} />
-                <GraderListCreateUpdate editable />
+                {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} /> : ""}