Merge pull request #1163 from MitanOmar/fix-verify-rejected-reports

fix: verify rejected reports
adfinis · Jan 11, 2024 · 912db0f · 912db0f
2 parents 32883c1 + 192c8a8
commit 912db0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/analysis/edit/controller.js b/app/analysis/edit/controller.js
@@ -134,6 +134,9 @@ export default class AnalysisEditController extends Controller {
   }
 
   get canVerify() {
+    if (this.intersection.lastSuccessful.value.model.rejected !== false) {
+      return false;
+    }
     return (
       allQueryParams(this).reviewer === this.session.data.user.id ||
       this.isSuperuser

diff --git a/app/models/report-intersection.js b/app/models/report-intersection.js
@@ -3,7 +3,7 @@ import Model, { attr, belongsTo } from "@ember-data/model";
 export default class ReportIntersection extends Model {
   @attr("string") comment;
   @attr("boolean", { allowNull: true, defaultValue: null }) notBillable;
-  @attr("boolean", { allowNull: true, defaultValue: null }) rejected;
+  @attr("boolean", { allowNull: true, defaultValue: false }) rejected;
   @attr("boolean", { allowNull: true, defaultValue: null }) review;
   @attr("boolean", { allowNull: true, defaultValue: null }) billed;
   @attr("boolean", { allowNull: true, defaultValue: null }) verified;