Merge pull request #292 from joyent/dustin/v4.x/bug-fixes

Bug fixes
joyent · Nov 30, 2020 · cf0bc22 · cf0bc22
2 parents 9ef18e9 + 9f0ae00
commit cf0bc22
Show file tree

Hide file tree

Showing 8 changed files with 290 additions and 266 deletions.
diff --git a/src/views/Builds/Build.vue b/src/views/Builds/Build.vue
@@ -22,7 +22,11 @@
           v-if="currentBuild.started && !currentBuild.completed"
           class="control"
         >
-          <a class="button is-success" @click="updateBuild('complete')">
+          <a
+            v-if="userIsAdmin"
+            class="button is-success"
+            @click="updateBuild('complete')"
+          >
             Complete Build
           </a>
         </p>
@@ -169,20 +173,19 @@ export default {
       return tabs;
     },
     userIsAdmin() {
+      const build = this.currentBuild;
       const user = this.currentUser;
 
-      if (user && user.is_admin) {
+      if (
+        (user && user.is_admin) ||
+        (build &&
+          build.admins &&
+          build.admins.length &&
+          build.admins.map(admin => admin.id).includes(user.id))
+      ) {
         return true;
       }
 
-      if (user && user.builds && user.builds.length) {
-        const build = user.builds.find(build => build.id === this.buildId);
-
-        if (build && build.role === 'admin') {
-          return true;
-        }
-      }
-
       return false;
     },
   },