Skip to content

Preserve order of source collection #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Preserve order of source collection #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae42874
Preserve default order of source collection
arturog Jul 2, 2011
af2a135
Helpers updated for Rails3
arturog Jul 2, 2011
cde1ae9
Oops! Bug when nil. Corrected.
arturog Jul 2, 2011
02788e8
Update versions
arturog Oct 26, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions dm-pager.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0"])
s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
s.add_development_dependency(%q<dm-migrations>, ["~> 1.1.0"])
s.add_development_dependency(%q<dm-sqlite-adapter>, ["~> 1.1.0"])
s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0"])
s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.2.0"])
s.add_development_dependency(%q<dm-migrations>, ["~> 1.2.0"])
s.add_development_dependency(%q<dm-sqlite-adapter>, ["~> 1.2.0"])
else
s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
s.add_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.1.0"])
s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
s.add_dependency(%q<dm-aggregates>, ["~> 1.2.0"])
s.add_dependency(%q<dm-migrations>, ["~> 1.2.0"])
s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.2.0"])
end
else
s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
s.add_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.1.0"])
s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
s.add_dependency(%q<dm-aggregates>, ["~> 1.2.0"])
s.add_dependency(%q<dm-migrations>, ["~> 1.2.0"])
s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.2.0"])
end
end
6 changes: 3 additions & 3 deletions lib/dm-pager/helpers/rails.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module DataMapper::Pagination::Helpers::Rails
# :size Number of intermediate page number links to be shown; Defaults to 7

def paginate collection, options = {}
uri = @template.url_for @template.params.merge(options[:params] || {})
collection.pager.to_html uri, options
uri = url_for params.merge(options[:params] || {})
collection.pager.to_html(uri, options).to_s.html_safe
end

end
end
2 changes: 0 additions & 2 deletions lib/dm-pager/pagination.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ def page page = nil, options = {}
collection = new_collection scoped_query(options = {
:limit => per_page,
:offset => (page - 1) * per_page,
:order => [:id.desc]
}.merge(query))
query.delete :order
options.merge! :total => count(query), page_param => page, :page_param => page_param
collection.pager = DataMapper::Pager.new options
collection
Expand Down