edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

fixes #1629

Browse Source
This commit is contained in:
r888888888 2013-05-24 14:21:01 -07:00
parent 560aad8a2d
commit 677d6c11a5
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/danbooru/paginator/active_record_extension.rb
View File

@ -34,17 +34,17 @@ module Danbooru
c = limit(records_per_page)
if before_id.to_i > 0
c = c.where("id < ?", before_id.to_i)
c = c.where("#{table_name}.id < ?", before_id.to_i)
end
c.reorder("id desc").tap do |obj|
c.reorder("#{table_name}.id desc").tap do |obj|
obj.extend(SequentialCollectionExtension)
obj.sequential_paginator_mode = :before
end
end
def paginate_sequential_after(after_id)
limit(records_per_page).where("id > ?", after_id.to_i).reorder("id asc").tap do |obj|
limit(records_per_page).where("#{table_name}.id > ?", after_id.to_i).reorder("#{table_name}.id asc").tap do |obj|
obj.extend(SequentialCollectionExtension)
obj.sequential_paginator_mode = :after
end

9
test/functional/dmails_controller_test.rb
View File

@ -65,9 +65,8 @@ class DmailsControllerTest < ActionController::TestCase
end
should "not show dmails not owned by the current user" do
assert_raise(User::PrivilegeError) do
get :show, {:id => @dmail.id}, {:user_id => @unrelated_user.id}
end
get :show, {:id => @dmail.id}, {:user_id => @unrelated_user.id}
assert_redirected_to(new_session_path(:url => "/dmails/#{@dmail.id}"))
end
end
@ -95,9 +94,7 @@ class DmailsControllerTest < ActionController::TestCase
should "not allow deletion if the dmail is not owned by the current user" do
assert_difference("Dmail.count", 0) do
assert_raises(User::PrivilegeError) do
post :destroy, {:id => @dmail.id}, {:user_id => @unrelated_user.id}
end
post :destroy, {:id => @dmail.id}, {:user_id => @unrelated_user.id}
end
end
end