Update bundle

[rails.git] / app / controllers / notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index e73b2ba035b4e66339bc45754f2d9c2d0c5d698a..d996251b3a65a23ae1ce5ffd2683ff7e2da200f4 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -319,21 +319,19 @@ class NotesController < ApplicationController
   # Generate a condition to choose which bugs we want based
   # on their status and the user's request parameters
   def closed_condition(notes)
   # Generate a condition to choose which bugs we want based
   # on their status and the user's request parameters
   def closed_condition(notes)

-    if params[:closed]
-      closed_since = params[:closed].to_i
-    else
-      closed_since = 7
-    end
+    closed_since = if params[:closed]
+                     params[:closed].to_i
+                   else
+                     7
+                   end

 
     if closed_since < 0
 
     if closed_since < 0

-      notes = notes.where("status != 'hidden'")
+      notes.where("status != 'hidden'")

     elsif closed_since > 0
     elsif closed_since > 0

-      notes = notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")
+      notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")

     else
     else

-      notes = notes.where("status = 'open'")
+      notes.where("status = 'open'")

     end
     end

-
-    notes

   end
 
   ##
   end
 
   ##