Merge pull request #814 from joecampo/monitoring-patch-1

[4.x] Fix for job rows on monitoring tags screen
laravel · Mar 31, 2020 · e2bb711 · e2bb711
2 parents aae114f + 0b18073
commit e2bb711
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/resources/js/screens/monitoring/job-row.vue b/resources/js/screens/monitoring/job-row.vue
@@ -26,11 +26,11 @@
             {{ readableTimestamp(job.payload.pushedAt) }}
         </td>
 
-        <td v-if="$route.params.type=='completed'" class="table-fit">
-            {{ readableTimestamp(job.completed_at) }}
+        <td v-if="$parent.type == 'jobs'" class="table-fit">
+            {{ job.completed_at ? readableTimestamp(job.completed_at) : '-' }}
         </td>
 
-        <td v-if="$route.params.type=='completed'" class="table-fit">
+        <td v-if="$parent.type == 'jobs'" class="table-fit">
             <span>{{ job.completed_at ? (job.completed_at - job.reserved_at).toFixed(2)+'s' : '-' }}</span>
         </td>
     </tr>