Skip to content

Rails 6.1 #193

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
jherdman wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Rails 6.1 #193

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27242fe
(refactor) Tidy Up Sort Clause Construction
jherdman Jan 26, 2021
d0359f3
(fix) Resolve Error with Sort Clause Construction
jherdman Jan 26, 2021
96965df
(fix) Attribute Method Detection
jherdman Jan 26, 2021
ee03c0e
Update Formatting to Make Justin Happy
jherdman Jan 29, 2021
504a473
Update lib/smart_listing.rb
jherdman Feb 1, 2021
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
16 changes: 14 additions & 2 deletions lib/smart_listing.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ def setup params, cookies
else
# let's sort by all attributes
#
@collection = @collection.order(sort_keys.collect{|s| "#{s[1]} #{@sort[s[0]]}" if @sort[s[0]]}.compact) if @sort && !@sort.empty?
if @sort && !@sort.empty?
sorting = sort_keys.collect{|s| "#{s[1]} #{@sort[s[0]]}".strip if @sort[s[0]]}.compact
@collection = @collection.order(sorting)
end

if @options[:paginate] && @per_page > 0
@collection = @collection.page(@page).per(@per_page)
Expand Down Expand Up @@ -200,14 +203,23 @@ def set_param key, value, store = @params
end
end

def attribute_method?(klass, attr)
klass_name = klass.name.to_s.camelize

attr = attr.split('.')[1] if attr.starts_with?("#{klass_name}.")

klass.attribute_method?(attr)
end

def parse_sort sort_params
sort = nil

if @options[:sort_attributes] == :implicit
return sort if sort_params.blank?

sort_params.map do |attr, dir|
key = attr.to_s if @options[:array] || @collection.klass.attribute_method?(attr)
key = attr.to_s if @options[:array] || attribute_method?(@collection.klass, attr)

if key && ALLOWED_DIRECTIONS[dir.to_s]
sort ||= {}
sort[key] = dir.to_s
Expand Down