scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-31 20:19:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3214 from okriuchykhin/ok_SCI_5555

Browse source 
Fix filtering on current tasks widget [SCI-5555]
This commit is contained in:
Alex Kriuchykhin 2021-03-17 10:40:53 +01:00 committed by GitHub
commit ee73088a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/dashboard/current_tasks.js
View file

@ -134,7 +134,7 @@ var DasboardCurrentTasksWidget = (function() {
$currentTasksList.find('.widget-placeholder').addClass($('.current-tasks-navbar .active').data('mode'));
}
}
appendTasksList(result, $currentTasksList);
appendTasksList(result, '.current-tasks-list-wrapper');
PerfectSb().update_all();
if (newList) InfiniteScroll.resetScroll('.current-tasks-list-wrapper');
animateSpinner($currentTasksList, false);

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

@ -26,7 +26,7 @@ module Dashboard
tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id })
end
tasks = tasks.where(my_module_status_id: task_filters[:statuses])
tasks = tasks.where(my_module_status_id: task_filters[:statuses]) if task_filters[:statuses].present?
case task_filters[:sort]
when 'start_date'