jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for post rss feeds, fix for notes

Browse Source
This commit is contained in:
albert
2013-02-17 00:45:08 -05:00
parent aaa946f0d8
commit 301bbbfde5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/forum_posts/_forum_post.html.erb
View File

@@ -7,7 +7,7 @@
<% end %> <% end %>
</h4> </h4>
<p> <p>
<%= time_ago_in_words_tagged(forum_post.created_at) %> ago <%= time_ago_in_words_tagged(forum_post.created_at) %>
</p> </p>
</div> </div>
<div class="content"> <div class="content">

2
app/views/notes/_note.html.erb
View File

@@ -1,3 +1,3 @@
<article data-width="<%= note.width %>" data-height="<%= note.height %>" data-x="<%= note.x %>" note-y="<%= note.y %>" data-id="<%= note.id %>"> <article data-width="<%= note.width %>" data-height="<%= note.height %>" data-x="<%= note.x %>" data-y="<%= note.y %>" data-id="<%= note.id %>">
<%= raw DText.sanitize(note.body) %> <%= raw DText.sanitize(note.body) %>
</article> </article>

4
config/deploy.rb
View File

@@ -93,12 +93,12 @@ end
namespace :delayed_job do namespace :delayed_job do
desc "Start delayed_job process" desc "Start delayed_job process"
task :start, :roles => :app do task :start, :roles => :app do
run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec script/delayed_job start" run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec ruby script/delayed_job start"
end end
desc "Stop delayed_job process" desc "Stop delayed_job process"
task :stop, :roles => :app do task :stop, :roles => :app do
run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec script/delayed_job stop" run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec ruby script/delayed_job stop"
end end
desc "Restart delayed_job process" desc "Restart delayed_job process"

8
config/routes.rb
View File

@@ -221,12 +221,12 @@ Danbooru::Application.routes.draw do
match "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml" match "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml"
match "/post/index.json", :controller => "legacy", :action => "posts", :format => "json" match "/post/index.json", :controller => "legacy", :action => "posts", :format => "json"
match "/post/index" => redirect {|params, req| "/posts?tags=#{req.params[:tags]}&page=#{req.params[:page]}"} match "/post/index" => redirect {|params, req| "/posts?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}&page=#{req.params[:page]}"}
match "/post" => redirect {|params, req| "/posts?tags=#{req.params[:tags]}&page=#{req.params[:page]}"} match "/post" => redirect {|params, req| "/posts?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}&page=#{req.params[:page]}"}
match "/post/upload" => redirect("/uploads/new") match "/post/upload" => redirect("/uploads/new")
match "/post/moderate" => redirect("/moderator/post/queue") match "/post/moderate" => redirect("/moderator/post/queue")
match "/post/atom" => redirect("/posts.atom") match "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}"}
match "/post/atom.feed" => redirect("/posts.atom") match "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}"}
match "/post/popular_by_day" => redirect("/explore/posts/popular") match "/post/popular_by_day" => redirect("/explore/posts/popular")
match "/post/popular_by_week" => redirect("/explore/posts/popular") match "/post/popular_by_week" => redirect("/explore/posts/popular")
match "/post/popular_by_month" => redirect("/explore/posts/popular") match "/post/popular_by_month" => redirect("/explore/posts/popular")