diff --git a/app/helpers/mission_control/jobs/jobs_helper.rb b/app/helpers/mission_control/jobs/jobs_helper.rb index f55f02d7..fa41f2a4 100644 --- a/app/helpers/mission_control/jobs/jobs_helper.rb +++ b/app/helpers/mission_control/jobs/jobs_helper.rb @@ -38,6 +38,10 @@ def job_delayed?(job) job.scheduled_at.before?(MissionControl::Jobs.scheduled_job_delay_threshold.ago) end + def job_reexecution(job) + (job.executions + 1).ordinalize if job.executions > 1 + end + private def renderable_job_arguments_for(job) job.serialized_arguments.collect do |argument| diff --git a/app/views/mission_control/jobs/jobs/_general_information.html.erb b/app/views/mission_control/jobs/jobs/_general_information.html.erb index e962e763..e4bafd22 100644 --- a/app/views/mission_control/jobs/jobs/_general_information.html.erb +++ b/app/views/mission_control/jobs/jobs/_general_information.html.erb @@ -31,6 +31,11 @@ Scheduled <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %> + <% if job_reexecution(job) %> +
+ <%= job_reexecution(job) %> reexecution +
+ <% end %> <% if job_delayed?(job) %>
delayed
<% end %> @@ -50,6 +55,11 @@ Finished at <%= time_distance_in_words_with_title(job.finished_at) %> ago + <% if job_reexecution(job) %> +
+ <%= job_reexecution(job) %> reexecution +
+ <% end %> <% end %> diff --git a/app/views/mission_control/jobs/jobs/_job.html.erb b/app/views/mission_control/jobs/jobs/_job.html.erb index 716dfdbc..194272f5 100644 --- a/app/views/mission_control/jobs/jobs/_job.html.erb +++ b/app/views/mission_control/jobs/jobs/_job.html.erb @@ -1,6 +1,9 @@ - <%= link_to job_title(job), application_job_path(@application, job.job_id) %> +
+ <%= link_to job_title(job), application_job_path(@application, job.job_id) %> + <%= job.job_id[0...8] %>… +
<% if job.serialized_arguments.present? %>
<%= job_arguments(job) %>
diff --git a/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb b/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb index 78b5a366..d71d0096 100644 --- a/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb +++ b/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb @@ -1,6 +1,11 @@ <%= link_to job.queue_name, application_queue_path(@application, job.queue) %> <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %> + <% if job_reexecution(job) %> +
+ <%= job_reexecution(job) %> reexecution +
+ <% end %> <% if job_delayed?(job) %>
delayed
<% end %>