task.rb in fat_free_crm-0.15.0.beta.2

- old
+ new

@@ -164,10 +164,11 @@
       "due_next_week"
     else
       "due_later"
     end
   end
+
   # Returns list of tasks grouping them by due date as required by tasks/index.
   #----------------------------------------------------------------------------
   def self.find_all_grouped(user, view)
     return {} unless ALLOWED_VIEWS.include?(view)
     settings = (view == "completed" ? Setting.task_completed : Setting.task_bucket)
@@ -192,11 +193,11 @@
   # Returns task totals for each of the views as needed by tasks sidebar.
   #----------------------------------------------------------------------------
   def self.totals(user, view = "pending")
     return {} unless ALLOWED_VIEWS.include?(view)
     settings = (view == "completed" ? Setting.task_completed : Setting.task_bucket)
-    settings.inject(HashWithIndifferentAccess[all: 0]) do |hash, key|
+    settings.each_with_object(HashWithIndifferentAccess[all: 0]) do |key, hash|
       hash[key] = (view == "assigned" ? assigned_by(user).send(key).pending.count : my(user).send(key).send(view).count)
       hash[:all] += hash[key]
       hash
     end
   end
@@ -218,11 +219,9 @@
       Time.zone.now.next_week.end_of_week
     when "due_later"
       Time.zone.now.midnight + 100.years
     when "specific_time"
       calendar ? parse_calendar_date : nil
-    else # due_later or due_asap
-      nil
     end
   end
 
   #----------------------------------------------------------------------------
   def due_end_of_day?