lib/qless/server/views/queue.erb in qless-0.9.3 vs lib/qless/server/views/queue.erb in qless-0.10.0
- old
+ new
@@ -38,24 +38,25 @@
}
</script>
<div class="subnav subnav-fixed">
<ul class="nav nav-pills">
- <li class="<%= tab == 'stats' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/stats" %>">Stats</a></li>
- <li class="<%= tab == 'running' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/running" %>">Running</a></li>
- <li class="<%= tab == 'waiting' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/waiting" %>">Waiting</a></li>
- <li class="<%= tab == 'scheduled' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/scheduled" %>">Scheduled</a></li>
- <li class="<%= tab == 'stalled' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/stalled" %>">Stalled</a></li>
- <li class="<%= tab == 'depends' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/depends" %>">Depends</a></li>
+ <li class="<%= tab == 'stats' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/stats" %>">Stats</a></li>
+ <li class="<%= tab == 'running' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/running" %>">Running</a></li>
+ <li class="<%= tab == 'waiting' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/waiting" %>">Waiting</a></li>
+ <li class="<%= tab == 'scheduled' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/scheduled" %>">Scheduled</a></li>
+ <li class="<%= tab == 'stalled' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/stalled" %>">Stalled</a></li>
+ <li class="<%= tab == 'depends' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/depends" %>">Depends</a></li>
+ <li class="<%= tab == 'recurring' ? 'active' : '' %>"><a href="<%= u "/queues/#{CGI::escape(queue['name'])}/recurring" %>">Recurring</a></li>
</ul>
</div>
<div id="alerts" style="margin-top: 40px"></div>
<div class="row">
<div class="span8">
- <h2><a href="<%= u "/queues/#{queue['name']}" %>"><%= queue['name'] %></a> |
+ <h2><a href="<%= u "/queues/#{CGI::escape(queue['name'])}" %>"><%= queue['name'] %></a> |
<%= queue['running'] %> /
<%= queue['waiting'] %> /
<%= queue['scheduled'] %> /
<%= queue['stalled'] %> /
<%= queue['depends'] %> <small>(running / waiting / scheduled / stalled / depends)</small>
@@ -71,10 +72,10 @@
</h2>
</div>
</div>
</div>
-<% if ['running', 'waiting', 'scheduled', 'stalled', 'depends'].include?(tab) %>
+<% if ['running', 'waiting', 'scheduled', 'stalled', 'depends', 'recurring'].include?(tab) %>
<hr/>
<%= erb :_job_list, :locals => { :jobs => jobs, :queues => queues } %>
<% else %>
<div class="row" style="margin-top: 15px">
<div class="span6">