Merge pull request #624 from trowik/fix-report-ability

fix(ability): can't edit reports if verified and reviewer
adfinis · Oct 6, 2021 · a299e97 · a299e97
2 parents 3a153c1 + 1b0d3e1
commit a299e97
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/app/abilities/report.js b/app/abilities/report.js
@@ -8,18 +8,19 @@ export default Ability.extend({
     function() {
       const isEditable =
         this.get("user.isSuperuser") ||
-        (!(this.get("model.verifiedBy.id") || this.get("model.billed")) &&
+        (!this.get("model.verifiedBy.id") &&
           (this.get("model.user.id") === this.get("user.id") ||
             (this.get("model.user.supervisors") ?? [])
               .mapBy("id")
               .includes(this.get("user.id"))));
-      const isReviewer = (this.get("model.taskAssignees") ?? [])
-        .concat(
-          this.get("model.projectAssignees") ?? [],
-          this.get("model.customerAssignees") ?? []
-        )
-        .mapBy("user.id")
-        .includes(this.get("user.id"));
+      const isReviewer =
+        (this.get("model.taskAssignees") ?? [])
+          .concat(
+            this.get("model.projectAssignees") ?? [],
+            this.get("model.customerAssignees") ?? []
+          )
+          .mapBy("user.id")
+          .includes(this.get("user.id")) && !this.get("model.verifiedBy.id");
       return isEditable || isReviewer;
     }
   )