kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Fix a number of issues with URL-unsafe queue names, fixes #3327

Browse source
This commit is contained in:
Mike Perham 2017-01-24 10:27:50 -08:00
parent 62bffb7e24
commit 878ffff0c9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/sidekiq/web/application.rb
View file

@ -85,7 +85,7 @@ module Sidekiq
name = route_params[:name] name = route_params[:name]
Sidekiq::Job.new(params['key_val'], name).delete Sidekiq::Job.new(params['key_val'], name).delete
redirect_with_query("#{root_path}queues/#{name}") redirect_with_query("#{root_path}queues/#{CGI.escape(name)}")
end end
get '/morgue' do get '/morgue' do

4
web/views/queue.erb
View file

@ -8,7 +8,7 @@
</h3> </h3>
</div> </div>
<div class="col-sm-4 pull-right"> <div class="col-sm-4 pull-right">
<%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %> <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
</div> </div>
</header> </header>
<div class="table_container"> <div class="table_container">
@ -32,7 +32,7 @@
<% end %> <% end %>
</td> </td>
<td> <td>
<form action="<%= root_path %>queues/<%= @name %>/delete" method="post"> <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
<%= csrf_tag %> <%= csrf_tag %>
<input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" /> <input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" />
<input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" /> <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />

4
web/views/queues.erb
View file

@ -10,14 +10,14 @@
<% @queues.each do |queue| %> <% @queues.each do |queue| %>
<tr> <tr>
<td> <td>
<a href="<%= root_path %>queues/<%= queue.name %>"><%= queue.name %></a> <a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
<% if queue.paused? %> <% if queue.paused? %>
<span class="label label-danger"><%= t('Paused') %></span> <span class="label label-danger"><%= t('Paused') %></span>
<% end %> <% end %>
</td> </td>
<td><%= number_with_delimiter(queue.size) %> </td> <td><%= number_with_delimiter(queue.size) %> </td>
<td class="delete-confirm"> <td class="delete-confirm">
<form action="<%=root_path %>queues/<%= queue.name %>" method="post"> <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
<%= csrf_tag %> <%= csrf_tag %>
<input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" /> <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
</form> </form>