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

Fix controller

Browse source
This commit is contained in:
Mojca Lorber 2020-03-03 16:17:29 +01:00
parent 7dfd1d5ba6
commit 4f37260571
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/dashboard/current_tasks_controller.rb
View file

@ -36,10 +36,9 @@ module Dashboard
end
page = (params[:page] || 1).to_i
tasks_per_page = tasks.page(page).per(Constants::INFINITE_SCROLL_LIMIT)
tasks = tasks.with_step_statistics.preload(experiment: :project).page(page).per(Constants::INFINITE_SCROLL_LIMIT)
tasks_per_page = tasks_per_page.with_step_statistics.preload(experiment: :project)
tasks_list = tasks_per_page.map do |task|
tasks_list = tasks.map do |task|
{ id: task.id,
link: protocols_my_module_path(task.id),
experiment: escape_input(task.experiment.name),
@ -53,7 +52,7 @@ module Dashboard
percentage: task.steps_completed_percentage } }
end
render json: { data: tasks_list, next_page: tasks_per_page.next_page }
render json: { data: tasks_list, next_page: tasks.next_page }
end
def project_filter