##// END OF EJS Templates
remove trailing white-spaces from app/helpers/sort_helper.rb....
Toshi MARUYAMA -
r6225:a51829eb2236
parent child
Show More
@@ -15,18 +15,18
15 15 #
16 16 # helper :sort
17 17 # include SortHelper
18 #
18 #
19 19 # def list
20 20 # sort_init 'last_name'
21 21 # sort_update %w(first_name last_name)
22 22 # @items = Contact.find_all nil, sort_clause
23 23 # end
24 #
24 #
25 25 # Controller (using Pagination module):
26 26 #
27 27 # helper :sort
28 28 # include SortHelper
29 #
29 #
30 30 # def list
31 31 # sort_init 'last_name'
32 32 # sort_update %w(first_name last_name)
@@ -34,9 +34,9
34 34 # :order_by => sort_clause,
35 35 # :per_page => 10
36 36 # end
37 #
37 #
38 38 # View (table header in list.rhtml):
39 #
39 #
40 40 # <thead>
41 41 # <tr>
42 42 # <%= sort_header_tag('id', :title => 'Sort by contact ID') %>
@@ -52,32 +52,32
52 52
53 53 module SortHelper
54 54 class SortCriteria
55
55
56 56 def initialize
57 57 @criteria = []
58 58 end
59
59
60 60 def available_criteria=(criteria)
61 61 unless criteria.is_a?(Hash)
62 62 criteria = criteria.inject({}) {|h,k| h[k] = k; h}
63 63 end
64 64 @available_criteria = criteria
65 65 end
66
66
67 67 def from_param(param)
68 68 @criteria = param.to_s.split(',').collect {|s| s.split(':')[0..1]}
69 69 normalize!
70 70 end
71
71
72 72 def criteria=(arg)
73 73 @criteria = arg
74 74 normalize!
75 75 end
76
76
77 77 def to_param
78 78 @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',')
79 79 end
80
80
81 81 def to_sql
82 82 sql = @criteria.collect do |k,o|
83 83 if s = @available_criteria[k]
@@ -86,33 +86,33 module SortHelper
86 86 end.compact.join(', ')
87 87 sql.blank? ? nil : sql
88 88 end
89
89
90 90 def add!(key, asc)
91 91 @criteria.delete_if {|k,o| k == key}
92 92 @criteria = [[key, asc]] + @criteria
93 93 normalize!
94 94 end
95
95
96 96 def add(*args)
97 97 r = self.class.new.from_param(to_param)
98 98 r.add!(*args)
99 99 r
100 100 end
101
101
102 102 def first_key
103 103 @criteria.first && @criteria.first.first
104 104 end
105
105
106 106 def first_asc?
107 107 @criteria.first && @criteria.first.last
108 108 end
109
109
110 110 def empty?
111 111 @criteria.empty?
112 112 end
113
113
114 114 private
115
115
116 116 def normalize!
117 117 @criteria ||= []
118 118 @criteria = @criteria.collect {|s| s = s.to_a; [s.first, (s.last == false || s.last == 'desc') ? false : true]}
@@ -120,7 +120,7 module SortHelper
120 120 @criteria.slice!(3)
121 121 self
122 122 end
123
123
124 124 # Appends DESC to the sort criterion unless it has a fixed order
125 125 def append_desc(criterion)
126 126 if criterion =~ / (asc|desc)$/i
@@ -130,14 +130,14 module SortHelper
130 130 end
131 131 end
132 132 end
133
133
134 134 def sort_name
135 135 controller_name + '_' + action_name + '_sort'
136 136 end
137 137
138 138 # Initializes the default sort.
139 139 # Examples:
140 #
140 #
141 141 # sort_init 'name'
142 142 # sort_init 'id', 'desc'
143 143 # sort_init ['name', ['id', 'desc']]
@@ -165,7 +165,7 module SortHelper
165 165 @sort_criteria.criteria = @sort_default if @sort_criteria.empty?
166 166 session[sort_name] = @sort_criteria.to_param
167 167 end
168
168
169 169 # Clears the sort criteria session data
170 170 #
171 171 def sort_clear
@@ -187,7 +187,7 module SortHelper
187 187 #
188 188 def sort_link(column, caption, default_order)
189 189 css, order = nil, default_order
190
190
191 191 if column.to_s == @sort_criteria.first_key
192 192 if @sort_criteria.first_asc?
193 193 css = 'sort asc'
@@ -198,10 +198,10 module SortHelper
198 198 end
199 199 end
200 200 caption = column.to_s.humanize unless caption
201
201
202 202 sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param }
203 203 url_options = params.merge(sort_options)
204
204
205 205 # Add project_id to url_options
206 206 url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id)
207 207
General Comments 0
You need to be logged in to leave comments. Login now