##// END OF EJS Templates
remove trailing white-spaces from issues helper source....
Toshi MARUYAMA -
r5711:fb41e3dab49d
parent child
Show More
@@ -5,12 +5,12
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -54,11 +54,11 module IssuesHelper
54 "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
54 "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
55 "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
55 "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
56 end
56 end
57
57
58 def issue_heading(issue)
58 def issue_heading(issue)
59 h("#{issue.tracker} ##{issue.id}")
59 h("#{issue.tracker} ##{issue.id}")
60 end
60 end
61
61
62 def render_issue_subject_with_tree(issue)
62 def render_issue_subject_with_tree(issue)
63 s = ''
63 s = ''
64 ancestors = issue.root? ? [] : issue.ancestors.visible.all
64 ancestors = issue.root? ? [] : issue.ancestors.visible.all
@@ -74,7 +74,7 module IssuesHelper
74 s << '</div>' * (ancestors.size + 1)
74 s << '</div>' * (ancestors.size + 1)
75 s
75 s
76 end
76 end
77
77
78 def render_descendants_tree(issue)
78 def render_descendants_tree(issue)
79 s = '<form><table class="list issues">'
79 s = '<form><table class="list issues">'
80 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
80 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
@@ -89,7 +89,7 module IssuesHelper
89 s << '</form></table>'
89 s << '</form></table>'
90 s
90 s
91 end
91 end
92
92
93 def render_custom_fields_rows(issue)
93 def render_custom_fields_rows(issue)
94 return if issue.custom_field_values.empty?
94 return if issue.custom_field_values.empty?
95 ordered_values = []
95 ordered_values = []
@@ -108,7 +108,7 module IssuesHelper
108 s << "</tr>\n"
108 s << "</tr>\n"
109 s
109 s
110 end
110 end
111
111
112 def issues_destroy_confirmation_message(issues)
112 def issues_destroy_confirmation_message(issues)
113 issues = [issues] unless issues.is_a?(Array)
113 issues = [issues] unless issues.is_a?(Array)
114 message = l(:text_issues_destroy_confirmation)
114 message = l(:text_issues_destroy_confirmation)
@@ -126,14 +126,14 module IssuesHelper
126 end
126 end
127 message
127 message
128 end
128 end
129
129
130 def sidebar_queries
130 def sidebar_queries
131 unless @sidebar_queries
131 unless @sidebar_queries
132 # User can see public queries and his own queries
132 # User can see public queries and his own queries
133 visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
133 visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
134 # Project specific queries and global queries
134 # Project specific queries and global queries
135 visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
135 visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
136 @sidebar_queries = Query.find(:all,
136 @sidebar_queries = Query.find(:all,
137 :select => 'id, name, is_public',
137 :select => 'id, name, is_public',
138 :order => "name ASC",
138 :order => "name ASC",
139 :conditions => visible.conditions)
139 :conditions => visible.conditions)
@@ -144,13 +144,13 module IssuesHelper
144 def query_links(title, queries)
144 def query_links(title, queries)
145 # links to #index on issues/show
145 # links to #index on issues/show
146 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
146 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
147
147
148 content_tag('h3', title) +
148 content_tag('h3', title) +
149 queries.collect {|query|
149 queries.collect {|query|
150 link_to(h(query.name), url_params.merge(:query_id => query))
150 link_to(h(query.name), url_params.merge(:query_id => query))
151 }.join('<br />')
151 }.join('<br />')
152 end
152 end
153
153
154 def render_sidebar_queries
154 def render_sidebar_queries
155 out = ''
155 out = ''
156 queries = sidebar_queries.select {|q| !q.is_public?}
156 queries = sidebar_queries.select {|q| !q.is_public?}
@@ -182,7 +182,7 module IssuesHelper
182 label = l(:field_parent_issue)
182 label = l(:field_parent_issue)
183 value = "##{detail.value}" unless detail.value.blank?
183 value = "##{detail.value}" unless detail.value.blank?
184 old_value = "##{detail.old_value}" unless detail.old_value.blank?
184 old_value = "##{detail.old_value}" unless detail.old_value.blank?
185
185
186 when detail.prop_key == 'is_private'
186 when detail.prop_key == 'is_private'
187 value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
187 value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
188 old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
188 old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
@@ -202,7 +202,7 module IssuesHelper
202 label ||= detail.prop_key
202 label ||= detail.prop_key
203 value ||= detail.value
203 value ||= detail.value
204 old_value ||= detail.old_value
204 old_value ||= detail.old_value
205
205
206 unless no_html
206 unless no_html
207 label = content_tag('strong', label)
207 label = content_tag('strong', label)
208 old_value = content_tag("i", h(old_value)) if detail.old_value
208 old_value = content_tag("i", h(old_value)) if detail.old_value
@@ -214,11 +214,11 module IssuesHelper
214 value = content_tag("i", h(value)) if value
214 value = content_tag("i", h(value)) if value
215 end
215 end
216 end
216 end
217
217
218 if detail.property == 'attr' && detail.prop_key == 'description'
218 if detail.property == 'attr' && detail.prop_key == 'description'
219 s = l(:text_journal_changed_no_detail, :label => label)
219 s = l(:text_journal_changed_no_detail, :label => label)
220 unless no_html
220 unless no_html
221 diff_link = link_to 'diff',
221 diff_link = link_to 'diff',
222 {:controller => 'journals', :action => 'diff', :id => detail.journal_id, :detail_id => detail.id},
222 {:controller => 'journals', :action => 'diff', :id => detail.journal_id, :detail_id => detail.id},
223 :title => l(:label_view_diff)
223 :title => l(:label_view_diff)
224 s << " (#{ diff_link })"
224 s << " (#{ diff_link })"
@@ -248,7 +248,7 module IssuesHelper
248 return record.name if record
248 return record.name if record
249 end
249 end
250 end
250 end
251
251
252 # Renders issue children recursively
252 # Renders issue children recursively
253 def render_api_issue_children(issue, api)
253 def render_api_issue_children(issue, api)
254 return if issue.leaf?
254 return if issue.leaf?
@@ -262,14 +262,14 module IssuesHelper
262 end
262 end
263 end
263 end
264 end
264 end
265
265
266 def issues_to_csv(issues, project = nil)
266 def issues_to_csv(issues, project = nil)
267 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
267 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
268 decimal_separator = l(:general_csv_decimal_separator)
268 decimal_separator = l(:general_csv_decimal_separator)
269 export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
269 export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
270 # csv header fields
270 # csv header fields
271 headers = [ "#",
271 headers = [ "#",
272 l(:field_status),
272 l(:field_status),
273 l(:field_project),
273 l(:field_project),
274 l(:field_tracker),
274 l(:field_tracker),
275 l(:field_priority),
275 l(:field_priority),
@@ -296,9 +296,9 module IssuesHelper
296 # csv lines
296 # csv lines
297 issues.each do |issue|
297 issues.each do |issue|
298 fields = [issue.id,
298 fields = [issue.id,
299 issue.status.name,
299 issue.status.name,
300 issue.project.name,
300 issue.project.name,
301 issue.tracker.name,
301 issue.tracker.name,
302 issue.priority.name,
302 issue.priority.name,
303 issue.subject,
303 issue.subject,
304 issue.assigned_to,
304 issue.assigned_to,
@@ -310,7 +310,7 module IssuesHelper
310 issue.done_ratio,
310 issue.done_ratio,
311 issue.estimated_hours.to_s.gsub('.', decimal_separator),
311 issue.estimated_hours.to_s.gsub('.', decimal_separator),
312 issue.parent_id,
312 issue.parent_id,
313 format_time(issue.created_on),
313 format_time(issue.created_on),
314 format_time(issue.updated_on)
314 format_time(issue.updated_on)
315 ]
315 ]
316 custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
316 custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
General Comments 0
You need to be logged in to leave comments. Login now