Merge pull request #1198 from MitanOmar/reviewer-can-remove-rejected-…

…directly-in-edit-reports-page feat: reviewer can remove rejected from edit report page
adfinis · Apr 11, 2024 · a632bb7 · a632bb7
2 parents 00ace83 + db89055
commit a632bb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/analysis/edit/controller.js b/app/analysis/edit/controller.js
@@ -133,14 +133,15 @@ export default class AnalysisEditController extends Controller {
  return this.intersectionModel.user.get("id") === this.session.data.user.id;
  }
 
+ get isReviewer() {
+ return allQueryParams(this).reviewer === this.session.data.user.id;
+ }
+
  get canVerify() {
  if (this.intersection.lastSuccessful.value.model.rejected !== false) {
  return false;
  }
- return (
- allQueryParams(this).reviewer === this.session.data.user.id ||
- this.isSuperuser
- );
+ return this.isReviewer || this.isSuperuser;
  }
 
  get canBill() {

diff --git a/app/analysis/edit/template.hbs b/app/analysis/edit/template.hbs
@@ -160,7 +160,7 @@
  @checked={{fi.value}}
  @onChange={{fi.update}}
  @disabled={{or
- (not this.canVerify)
+ (and (not this.isReviewer) (not this.isSuperuser))
  this.hasSelectedOwnReports
  }}
  >