Skip to content

Commit 81635dd

Browse files
authored
Merge pull request sidekiq-cron#270 from n00dle/add-confirm-to-web-enque
Add javascript confirmation to enqueue buttons
2 parents a052139 + 874f0cc commit 81635dd

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

lib/sidekiq/cron/locales/en.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ en:
88
EnqueueAll: Enqueue All
99
DeleteAll: Delete All
1010
'Cron string': Cron
11+
AreYouSureEnqueueCronJobs: Are you sure you want to enqueue ALL cron jobs?
12+
AreYouSureEnqueueCronJob: Are you sure you want to enqueue the %{job} cron job?
1113
AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
1214
AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
1315
NoCronJobsWereFound: No cron jobs were found

lib/sidekiq/cron/views/cron.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<header class='row'>
22
<div class='col-sm-5 pull-left'>
3-
<h3><%=t 'CronJobs' %></h3>
3+
<h3><%= t('CronJobs') %></h3>
44
</div>
55
<div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
66
<% if @cron_jobs.size > 0 %>
77
<form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
88
<%= csrf_tag if respond_to?(:csrf_tag) %>
9-
<input class="btn btn-small btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>">
9+
<input class="btn btn-small btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>" />
1010
</form>
1111
<form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
1212
<%= csrf_tag if respond_to?(:csrf_tag) %>
@@ -18,7 +18,7 @@
1818
</form>
1919
<form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
2020
<%= csrf_tag if respond_to?(:csrf_tag) %>
21-
<input class="btn btn-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" />
21+
<input class="btn btn-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
2222
</form>
2323
<% end %>
2424
</div>
@@ -61,7 +61,7 @@
6161
<% if job.status == 'enabled' %>
6262
<form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
6363
<%= csrf_tag if respond_to?(:csrf_tag) %>
64-
<input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
64+
<input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
6565
</form>
6666
<form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/disable" method="post">
6767
<%= csrf_tag if respond_to?(:csrf_tag) %>

lib/sidekiq/cron/views/cron.slim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ header.row
1515
input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnableAll')}"
1616
form.pull-right action="#{root_path}cron/__all__/enque" method="post"
1717
= csrf_tag if respond_to?(:csrf_tag)
18-
input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}"
18+
input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}" data-confirm="#{t('AreYouSureEnqueueCronJobs')}"
1919

2020
- if @cron_jobs.size > 0
2121

@@ -59,7 +59,7 @@ header.row
5959
-else
6060
form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"
6161
= csrf_tag if respond_to?(:csrf_tag)
62-
input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}"
62+
input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}" data-confirm="#{t('AreYouSureEnqueueCronJob', :job => job.name)}"
6363
form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enable" method="post"
6464
= csrf_tag if respond_to?(:csrf_tag)
6565
input.btn.btn-small.pull-left type="submit" name="enable" value="#{t('Enable')}"

lib/sidekiq/cron/views/cron_show.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<% cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
1010
<form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" class="pull-right" method="post">
1111
<%= csrf_tag if respond_to?(:csrf_tag) %>
12-
<input class="btn btn-small pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" />
12+
<input class="btn btn-small pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => @job.name) %>" />
1313
</form>
1414
<% if @job.status == 'enabled' %>
1515
<form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">

lib/sidekiq/cron/views/cron_show.slim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ header.row
77
- cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}"
88
form.pull-right action="#{cron_job_path}/enque?redirect=#{cron_job_path}" method="post"
99
= csrf_tag if respond_to?(:csrf_tag)
10-
input.btn.btn-small.pull-left name="enque" type="submit" value="#{t('EnqueueNow')}"
10+
input.btn.btn-small.pull-left data-confirm="#{t('AreYouSureEnqueueCronJob', :job => @job.name)}" name="enque" type="submit" value="#{t('EnqueueNow')}"
1111
- if @job.status == 'enabled'
1212
form.pull-right action="#{cron_job_path}/disable?redirect=#{cron_job_path}" method="post"
1313
= csrf_tag if respond_to?(:csrf_tag)
@@ -18,7 +18,7 @@ header.row
1818
input.btn.btn-small.pull-left name="enable" type="submit" value="#{t('Enable')}"
1919
form.pull-right action="#{cron_job_path}/delete" method="post"
2020
= csrf_tag if respond_to?(:csrf_tag)
21-
input.btn.btn-danger.btn-small data-confirm="#{t('AreYouSureDeleteCronJob' job [email protected])}" name="delete" type="submit" value="#{t('Delete')}" /
21+
input.btn.btn-danger.btn-small data-confirm="#{t('AreYouSureDeleteCronJob', :job => @job.name)}" name="delete" type="submit" value="#{t('Delete')}" /
2222

2323
table.table.table-bordered.table-striped
2424
tbody

0 commit comments

Comments
 (0)