From 98402908b0d87b66bc3cac9d5a68782f3d966bc8 Mon Sep 17 00:00:00 2001 From: ENT8R Date: Sun, 26 Aug 2018 16:04:09 +0200 Subject: [PATCH] Improve code style, fix tests --- app/controllers/notes_controller.rb | 16 +++++++--------- test/controllers/notes_controller_test.rb | 3 --- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 24ef13bf9..24d60830c 100644 --- 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? - 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] - 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}')") diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb index 1ebce60b5..e4401d6e9 100644 --- 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 - get :search - assert_response :bad_request - get :search, :params => { :q => "no match", :limit => "0", :format => "json" } assert_response :bad_request -- 2.43.2