Expand items search field for user and room
This commit is contained in:
@@ -15,10 +15,10 @@ class CategoriesController < ApplicationController
|
|||||||
|
|
||||||
if params[:query].present?
|
if params[:query].present?
|
||||||
query_str = "%#{params[:query]}%"
|
query_str = "%#{params[:query]}%"
|
||||||
@items = @items.where(
|
@items = @items.left_outer_joins(:user).left_outer_joins(:room).where(
|
||||||
"items.name LIKE :q OR items.sku LIKE :q OR items.serial_number LIKE :q OR items.sticker_id LIKE :q",
|
"items.name LIKE :q OR items.sku LIKE :q OR items.serial_number LIKE :q OR items.sticker_id LIKE :q OR users.first_name LIKE :q OR users.last_name LIKE :q OR rooms.name LIKE :q",
|
||||||
q: query_str
|
q: query_str
|
||||||
)
|
).order("items.name ASC")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ class ItemsController < ApplicationController
|
|||||||
|
|
||||||
if params[:query].present?
|
if params[:query].present?
|
||||||
query_str = "%#{params[:query]}%"
|
query_str = "%#{params[:query]}%"
|
||||||
# Durchsucht Name, SKU, Seriennummer und deine Sticker-ID gleichzeitig
|
# Durchsucht Name, SKU, Seriennummer und deine Sticker-ID und firstname und lastname gleichzeitig
|
||||||
@items = @items.where(
|
@items = @items.left_outer_joins(:user).left_outer_joins(:room).where(
|
||||||
"items.name LIKE :q OR items.sku LIKE :q OR items.serial_number LIKE :q OR items.sticker_id LIKE :q",
|
"items.name LIKE :q OR items.sku LIKE :q OR items.serial_number LIKE :q OR items.sticker_id LIKE :q OR users.first_name LIKE :q OR users.last_name LIKE :q OR rooms.name LIKE :q",
|
||||||
q: query_str
|
q: query_str
|
||||||
)
|
).order("items.name ASC")
|
||||||
end
|
end
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
|||||||
Reference in New Issue
Block a user