kotovalexarian-likes-github/endofunky--sidetiq
1
0
Fork 0
mirror of https://github.com/endofunky/sidetiq.git synced 2022-11-09 13:53:30 -05:00
Code Releases Activity

fix for use with sinatra-cache

Browse source 
seeing an issue where sinatra-cache takes over the rendering path and
using `File.dirname` from the view is somewhere deep within the cache
gem root. this ensures we have the right path
This commit is contained in:
Luke van der Hoeven 2014-01-31 11:34:27 -05:00
parent 0b599e7402
commit dd92e2b5dc
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/sidetiq/views/history.erb
View file

@ -1,4 +1,4 @@
<%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
<%= File.read(File.join(view_path, 'assets', 'styles.css')) %>
<header class="row">
<div class="col-md-5">
@ -8,7 +8,7 @@
<div class="container">
<div class="row">
<%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_worker_nav.erb')) %>
<%= erb File.read(File.join(view_path, '_worker_nav.erb')) %>
<div class="col-md-9">
<table class="table table-striped table-bordered table-hover table-white" style="width: 100%; margin: 0; table-layout:fixed;">

4
lib/sidetiq/views/locks.erb
View file

@ -1,4 +1,4 @@
<%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
<%= File.read(File.join(view_path, 'assets', 'styles.css')) %>
<header class="row">
<div class="col-md-5">
@ -8,7 +8,7 @@
<div class="container">
<div class="row">
<%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_home_nav.erb')) %>
<%= erb File.read(File.join(view_path, '_home_nav.erb')) %>
<div class="col-md-9">
<% if @locks.length > 0 %>

4
lib/sidetiq/views/schedule.erb
View file

@ -1,4 +1,4 @@
<%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
<%= File.read(File.join(view_path, 'assets', 'styles.css')) %>
<header class="row">
<div class="col-md-5">
@ -8,7 +8,7 @@
<div class="container">
<div class="row">
<%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_worker_nav.erb')) %>
<%= erb File.read(File.join(view_path, '_worker_nav.erb')) %>
<div class="col-md-9">
<% if (recurrences = @schedule.recurrence_rules).length > 0 %>

4
lib/sidetiq/views/sidetiq.erb
View file

@ -1,4 +1,4 @@
<%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
<%= File.read(File.join(view_path, 'assets', 'styles.css')) %>
<header class="row">
<div class="col-sm-5">
@ -8,7 +8,7 @@
<div class="container">
<div class="row">
<%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_home_nav.erb')) %>
<%= erb File.read(File.join(view_path, '_home_nav.erb')) %>
<div class="col-md-9">
<% if @workers.length > 0 %>

8
lib/sidetiq/web.rb
View file

@ -8,13 +8,13 @@ module Sidetiq
app.get "/sidetiq" do
@workers = Sidetiq.workers
@time = Sidetiq.clock.gettime
erb File.read(File.join(VIEWS, 'sidetiq.erb'))
erb File.read(File.join(VIEWS, 'sidetiq.erb')), locals: {view_path: VIEWS}
end
app.get "/sidetiq/locks" do
@locks = Sidetiq::Lock::Redis.all.map(&:meta_data)
erb File.read(File.join(VIEWS, 'locks.erb'))
erb File.read(File.join(VIEWS, 'locks.erb')), locals: {view_path: VIEWS}
end
app.get "/sidetiq/:name/schedule" do
@ -28,7 +28,7 @@ module Sidetiq
@schedule = @worker.schedule
erb File.read(File.join(VIEWS, 'schedule.erb'))
erb File.read(File.join(VIEWS, 'schedule.erb')), locals: {view_path: VIEWS}
end
app.get "/sidetiq/:name/history" do
@ -44,7 +44,7 @@ module Sidetiq
redis.lrange("sidetiq:#{name}:history", 0, -1)
end
erb File.read(File.join(VIEWS, 'history.erb'))
erb File.read(File.join(VIEWS, 'history.erb')), locals: {view_path: VIEWS}
end
app.post "/sidetiq/:name/trigger" do