meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

remove spaces inside {} of TimelogHelper

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20059 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-09-21 13:03:45 +00:00
parent 1eed339756
commit 60c8ac0de1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/timelog_helper.rb
View File

@ -38,7 +38,7 @@ module TimelogHelper
else else
collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default) collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
end end
activities.each { |a| collection << [a.name, a.id] } activities.each {|a| collection << [a.name, a.id]}
collection collection
end end
@ -50,7 +50,7 @@ module TimelogHelper
def select_hours(data, criteria, value) def select_hours(data, criteria, value)
if value.to_s.empty? if value.to_s.empty?
data.select {|row| row[criteria].blank? } data.select {|row| row[criteria].blank?}
else else
data.select {|row| row[criteria].to_s == value.to_s} data.select {|row| row[criteria].to_s == value.to_s}
end end
@ -88,7 +88,7 @@ module TimelogHelper
def report_to_csv(report) def report_to_csv(report)
Redmine::Export::CSV.generate(:encoding => params[:encoding]) do |csv| Redmine::Export::CSV.generate(:encoding => params[:encoding]) do |csv|
# Column headers # Column headers
headers = report.criteria.collect {|criteria| l_or_humanize(report.available_criteria[criteria][:label]) } headers = report.criteria.collect {|criteria| l_or_humanize(report.available_criteria[criteria][:label])}
headers += report.periods headers += report.periods
headers << l(:label_total_time) headers << l(:label_total_time)
csv << headers csv << headers