Commit 7f43b65f authored by Clement Ho's avatar Clement Ho

Merge branch 'winh-job-list-dynamic-timer' into 'master'

Add dynamic timer for delayed jobs in job list

See merge request gitlab-org/gitlab-ce!22656
parents d3a407d6 d0747af4
import Vue from 'vue';
import GlCountdown from '~/vue_shared/components/gl_countdown.vue';
document.addEventListener('DOMContentLoaded', () => {
const remainingTimeElements = document.querySelectorAll('.js-remaining-time');
remainingTimeElements.forEach(
el =>
new Vue({
...GlCountdown,
el,
propsData: {
endDateString: el.dateTime,
},
}),
);
});
...@@ -105,10 +105,10 @@ ...@@ -105,10 +105,10 @@
= icon('remove', class: 'cred') = icon('remove', class: 'cred')
- elsif job.scheduled? - elsif job.scheduled?
.btn-group .btn-group
.btn.btn-default.has-tooltip{ disabled: true, .btn.btn-default{ disabled: true }
title: job.scheduled_at }
= sprite_icon('planning') = sprite_icon('planning')
= duration_in_numbers(job.execute_in) %time.js-remaining-time{ datetime: job.scheduled_at.utc.iso8601 }
= duration_in_numbers(job.execute_in)
- confirmation_message = s_("DelayedJobs|Are you sure you want to run %{job_name} immediately? This job will run automatically after it's timer finishes.") % { job_name: job.name } - confirmation_message = s_("DelayedJobs|Are you sure you want to run %{job_name} immediately? This job will run automatically after it's timer finishes.") % { job_name: job.name }
= link_to play_project_job_path(job.project, job, return_to: request.original_url), = link_to play_project_job_path(job.project, job, return_to: request.original_url),
method: :post, method: :post,
......
---
title: Add dynamic timer for delayed jobs in job list
merge_request: 22656
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment