##// END OF EJS Templates
jro_apps » redmine
RSS
Code cleanup....
Jean-Philippe Lang -
r8604:cd4a19241ad7
parent child
Show More
Side by Side Unified
Context file:
r8604:cd4a19241ad7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -203,26 +203,26 module IssuesHelper
203 when 'attr'
203 when 'attr'
204 field = detail.prop_key.to_s.gsub(/\_id$/, "")
204 field = detail.prop_key.to_s.gsub(/\_id$/, "")
205 label = l(("field_" + field).to_sym)
205 label = l(("field_" + field).to_sym)
206 case
206 case detail.prop_key
207 when ['due_date', 'start_date'].include?(detail.prop_key)
207 when 'due_date', 'start_date'
208 value = format_date(detail.value.to_date) if detail.value
208 value = format_date(detail.value.to_date) if detail.value
209 old_value = format_date(detail.old_value.to_date) if detail.old_value
209 old_value = format_date(detail.old_value.to_date) if detail.old_value
210
210
211 when ['project_id', 'status_id', 'tracker_id', 'assigned_to_id',
211 when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
212 'priority_id', 'category_id', 'fixed_version_id'].include?(detail.prop_key)
212 'priority_id', 'category_id', 'fixed_version_id'
213 value = find_name_by_reflection(field, detail.value)
213 value = find_name_by_reflection(field, detail.value)
214 old_value = find_name_by_reflection(field, detail.old_value)
214 old_value = find_name_by_reflection(field, detail.old_value)
215
215
216 when detail.prop_key == 'estimated_hours'
216 when 'estimated_hours'
217 value = "%0.02f" % detail.value.to_f unless detail.value.blank?
217 value = "%0.02f" % detail.value.to_f unless detail.value.blank?
218 old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
218 old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
219
219
220 when detail.prop_key == 'parent_id'
220 when 'parent_id'
221 label = l(:field_parent_issue)
221 label = l(:field_parent_issue)
222 value = "##{detail.value}" unless detail.value.blank?
222 value = "##{detail.value}" unless detail.value.blank?
223 old_value = "##{detail.old_value}" unless detail.old_value.blank?
223 old_value = "##{detail.old_value}" unless detail.old_value.blank?
224
224
225 when detail.prop_key == 'is_private'
225 when 'is_private'
226 value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
226 value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
227 old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
227 old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
228 end
228 end
@@ -265,10 +265,10 module IssuesHelper
265 s << " (#{ diff_link })"
265 s << " (#{ diff_link })"
266 end
266 end
267 s.html_safe
267 s.html_safe
268 elsif !detail.value.blank?
268 elsif detail.value.present?
269 case detail.property
269 case detail.property
270 when 'attr', 'cf'
270 when 'attr', 'cf'
271 if !detail.old_value.blank?
271 if detail.old_value.present?
272 l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
272 l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
273 elsif multiple
273 elsif multiple
274 l(:text_journal_added, :label => label, :value => value).html_safe
274 l(:text_journal_added, :label => label, :value => value).html_safe
General Comments 0
You need to be logged in to leave comments. Login now