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

Merge pull request #4749 from artoscinote/ma_SCI_7653

Browse source 
Fix display of tasks table in archived experiments [SCI-7653]
This commit is contained in:
artoscinote 2023-01-04 13:14:22 +01:00 committed by GitHub
commit 36af73eb7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/experiments_controller.rb
View file

@ -94,17 +94,23 @@ class ExperimentsController < ApplicationController
@current_sort = view_state.state.dig('my_modules', view_mode, 'sort') || 'atoz'
@project = @experiment.project
if params[:view_mode] == 'archived'
@my_modules = @experiment.my_modules.archived.order(:name)
else
@my_modules = @experiment.my_modules.active.order(:name)
end
@my_modules = if @experiment.archived?
@experiment.my_modules.order(:name)
elsif params[:view_mode] == 'archived'
@experiment.my_modules.archived.order(:name)
else
@experiment.my_modules.active.order(:name)
end
@my_module_visible_table_columns = current_user.my_module_visible_table_columns
end
def load_table
my_modules = @experiment.my_modules.readable_by_user(current_user)
my_modules = params[:view_mode] == 'archived' ? my_modules.archived : my_modules.active
unless @experiment.archived?
my_modules = params[:view_mode] == 'archived' ? my_modules.archived : my_modules.active
end
render json: Experiments::TableViewService.new(@experiment, my_modules, current_user, params).call
end