diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:37:42 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:37:42 +0000 |
| commit | 7f43b65fe54962a2fd3e4fd5d5413e4b1a0cf9c2 (patch) | |
| tree | 8307b96898fa6ef0d4e2525d473c107ecc26f0d8 | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| parent | d0747af4975dbae44c1ba06da77ac52f41f958cc (diff) | |
| download | gitlab-ce-7f43b65fe54962a2fd3e4fd5d5413e4b1a0cf9c2.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/pages/projects/jobs/index/index.js | 16 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/winh-job-list-dynamic-timer.yml | 5 |
3 files changed, 24 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/projects/jobs/index/index.js b/app/assets/javascripts/pages/projects/jobs/index/index.js new file mode 100644 index 00000000000..1b57c67f16b --- /dev/null +++ b/app/assets/javascripts/pages/projects/jobs/index/index.js @@ -0,0 +1,16 @@ +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, + }, + }), + ); +}); diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index f5685d3b50d..0b10c66777a 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -105,10 +105,10 @@ = icon('remove', class: 'cred') - elsif job.scheduled? .btn-group - .btn.btn-default.has-tooltip{ disabled: true, - title: job.scheduled_at } + .btn.btn-default{ disabled: true } = 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 } = link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, diff --git a/changelogs/unreleased/winh-job-list-dynamic-timer.yml b/changelogs/unreleased/winh-job-list-dynamic-timer.yml new file mode 100644 index 00000000000..333a974d6aa --- /dev/null +++ b/changelogs/unreleased/winh-job-list-dynamic-timer.yml @@ -0,0 +1,5 @@ +--- +title: Add dynamic timer for delayed jobs in job list +merge_request: 22656 +author: +type: changed |