scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-24 15:54:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix archived on filters fix [SCI-6579] (#3897)

Browse source 
Co-authored-by: Anton <anton@scinote.net>
This commit is contained in:
aignatov-bio 2022-02-25 14:29:27 +01:00 committed by GitHub
parent 899f2efbd6
commit 7b4968a7a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/services/repository_datatable_service.rb
View file

@ -250,6 +250,8 @@ class RepositoryDatatableService
end end
def build_archived_on_filter_condition(repository_rows, filter_element_params) def build_archived_on_filter_condition(repository_rows, filter_element_params)
return repository_rows unless @params[:archived]
case filter_element_params[:operator] case filter_element_params[:operator]
when 'today' when 'today'
repository_rows.where("date_trunc('minute', \"archived_on\") >= ? AND date_trunc('minute', \"archived_on\") <= ?", repository_rows.where("date_trunc('minute', \"archived_on\") >= ? AND date_trunc('minute', \"archived_on\") <= ?",
@ -271,8 +273,8 @@ class RepositoryDatatableService
Time.zone.now.beginning_of_year - 1.year, Time.zone.now.beginning_of_year) Time.zone.now.beginning_of_year - 1.year, Time.zone.now.beginning_of_year)
when 'this_year' when 'this_year'
repository_rows.where( repository_rows.where(
"date_trunc('minute', \"repository_rows\".\"created_at\") >= ? AND "\ "date_trunc('minute', \"repository_rows\".\"archived_on\") >= ? AND "\
"date_trunc('minute', \"repository_rows\".\"created_at\") <= ?", "date_trunc('minute', \"repository_rows\".\"archived_on\") <= ?",
Time.zone.now.beginning_of_year, Time.zone.now.beginning_of_year,
Time.zone.now.end_of_year Time.zone.now.end_of_year
) )
@ -317,6 +319,8 @@ class RepositoryDatatableService
end end
def build_archived_by_filter_condition(repository_rows, filter_element_params) def build_archived_by_filter_condition(repository_rows, filter_element_params)
return repository_rows unless @params[:archived]
case filter_element_params[:operator] case filter_element_params[:operator]
when 'any_of' when 'any_of'
repository_rows.joins(:archived_by) repository_rows.joins(:archived_by)