From 2f9d583fac696703b9d67402c56694cd7ea3d053 Mon Sep 17 00:00:00 2001 From: jasder Date: Mon, 17 May 2021 16:57:46 +0800 Subject: [PATCH] FIX add nickname lastname query conditions for list users api --- app/models/user.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 2f67410c0..03989cbab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -168,7 +168,8 @@ class User < Owner # Groups and active users scope :active, lambda { where(status: STATUS_ACTIVE) } scope :like, lambda { |keywords| - where("LOWER(concat(lastname, firstname, login, mail)) LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank? + sql = "CONCAT(lastname, firstname) LIKE :keyword OR login LIKE :keyword OR mail LIKE :keyword OR nickname LIKE :keyword" + where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank? } scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}