Improve code style, fix tests

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 24ef13bf936118fcbdccee7b9a43cc0a97703695..24d60830c4560d128eb3660ad1cf40ca01e3c23d 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -275,19 +275,17 @@ class NotesController < ApplicationController
     # Filter by a given string
     if params[:q]
       # TODO: why doesn't this work if we want to filter the notes of a given user?
     # Filter by a given string
     if params[:q]
       # TODO: why doesn't this work if we want to filter the notes of a given user?

-      if !params[:display_name] && !params[:id]
-        @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q])
-      end
+      @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) unless params[:display_name] || params[:id]

     end
 
     # Filter by a given start date and an optional end date
     if params[:from]
     end
 
     # Filter by a given start date and an optional end date
     if params[:from]

-      from = DateTime.parse(params[:from])
-      if params[:to]
-        to = DateTime.parse(params[:to])
-      else
-        to = DateTime.now
-      end
+      from = Time.parse(params[:from])
+      to = if params[:to]
+             Time.parse(params[:to])
+           else
+             Time.now
+           end

 
       if from && to
         @notes = @notes.where("(created_at > '#{from}' AND created_at < '#{to}')")
 
       if from && to
         @notes = @notes.where("(created_at > '#{from}' AND created_at < '#{to}')")

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 1ebce60b53dcfa8659612e0f31a0b7061005e9f7..e4401d6e9ee1a0c6f9861ac148121a5e2dd80843 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -912,9 +912,6 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_search_bad_params
   end
 
   def test_search_bad_params

-    get :search
-    assert_response :bad_request
-

     get :search, :params => { :q => "no match", :limit => "0", :format => "json" }
     assert_response :bad_request
 
     get :search, :params => { :q => "no match", :limit => "0", :format => "json" }
     assert_response :bad_request