mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-11-10 00:11:22 +08:00
Merge pull request #8580 from andrej-scinote/aj_SCI_11994
Fix project filtering to exclude folders from results [SCI-11994]
This commit is contained in:
commit
8657036e28
1 changed files with 2 additions and 0 deletions
|
|
@ -23,6 +23,8 @@ module Lists
|
||||||
|
|
||||||
if @filters[:folder_search].present? && @filters[:folder_search] == 'true'
|
if @filters[:folder_search].present? && @filters[:folder_search] == 'true'
|
||||||
@records = projects
|
@records = projects
|
||||||
|
elsif @filters.present?
|
||||||
|
@records = projects.where(project_folder: @current_folder)
|
||||||
else
|
else
|
||||||
projects = projects.where(project_folder: @current_folder)
|
projects = projects.where(project_folder: @current_folder)
|
||||||
folders = folders.where(parent_folder: @current_folder)
|
folders = folders.where(parent_folder: @current_folder)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue