]> source.dussan.org Git - redmine.git/commitdiff
shorten long line of TimelogHelper
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 10 Dec 2020 13:34:38 +0000 (13:34 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 10 Dec 2020 13:34:38 +0000 (13:34 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@20614 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/timelog_helper.rb

index d03fc92731ecd740cd3bd21011bf198b42ccad11..4d6a9d825c6198b83062e81397b300121d384532 100644 (file)
@@ -34,9 +34,11 @@ module TimelogHelper
 
     collection = []
     if time_entry && time_entry.activity && !time_entry.activity.active?
-      collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
+      collection << ["--- #{l(:actionview_instancetag_blank_option)} ---", '']
     else
-      collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
+      unless activities.detect(&:is_default)
+        collection << ["--- #{l(:actionview_instancetag_blank_option)} ---", '']
+      end
     end
     activities.each {|a| collection << [a.name, a.id]}
     collection
@@ -44,7 +46,9 @@ module TimelogHelper
 
   def user_collection_for_select_options(time_entry)
     collection = time_entry.assignable_users
-    collection << time_entry.user if time_entry.user && !collection.include?(time_entry.user)
+    if time_entry.user && !collection.include?(time_entry.user)
+      collection << time_entry.user
+    end
     principals_options_for_select(collection, time_entry.user_id.to_s)
   end
 
@@ -88,15 +92,19 @@ module TimelogHelper
   def report_to_csv(report)
     Redmine::Export::CSV.generate(:encoding => params[:encoding]) do |csv|
       # Column headers
-      headers = report.criteria.collect {|criteria| l_or_humanize(report.available_criteria[criteria][:label])}
+      headers =
+        report.criteria.collect do |criteria|
+          l_or_humanize(report.available_criteria[criteria][:label])
+        end
       headers += report.periods
       headers << l(:label_total_time)
       csv << headers
       # Content
-      report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
+      report_criteria_to_csv(csv, report.available_criteria, report.columns,
+                             report.criteria, report.periods, report.hours)
       # Total row
       str_total = l(:label_total_time)
-      row = [ str_total ] + [''] * (report.criteria.size - 1)
+      row = [str_total] + [''] * (report.criteria.size - 1)
       total = 0
       report.periods.each do |period|
         sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))