From 6a82939adb823c9a65829c23dc7109a96480befe Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <scarpino@kde.org>
Date: Sun, 10 Dec 2017 19:35:46 +0100
Subject: [PATCH] Fix account and tag searches with leading/trailing spaces
(#5965)
* Strip leading & trailing spaces from account query
* Strip leading & trailing spaces from tag search
---
app/models/tag.rb | 2 +-
app/services/account_search_service.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 0fa08e157c..dc2c8d1290 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -23,7 +23,7 @@ class Tag < ApplicationRecord
class << self
def search_for(term, limit = 5)
- pattern = sanitize_sql_like(term) + '%'
+ pattern = sanitize_sql_like(term.strip) + '%'
Tag.where('lower(name) like lower(?)', pattern).order(:name).limit(limit)
end
end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index a289ceac4f..3be1106654 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -4,7 +4,7 @@ class AccountSearchService < BaseService
attr_reader :query, :limit, :options, :account
def call(query, limit, account = nil, options = {})
- @query = query
+ @query = query.strip
@limit = limit
@options = options
@account = account