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

Merge pull request #2942 from mlorb/ml-sci-5152

Browse source 
Add 403 error handling to current tasks dashboard widget [SCI-5152]
This commit is contained in:
mlorb 2020-11-12 09:04:31 +01:00 committed by GitHub
commit 614bba01de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,12 +27,16 @@ var DasboardCurrentTasksWidget = (function() {
return values;
}
function resetMarkAppliedFilters() {
$('.filter-container').removeClass('filters-applied');
}
function markAppliedFilters(state) {
if (state.statuses.sort().toString() === getDefaultStatusValues().sort().toString()
&& (state.project_id.length === 0)
&& (state.sort === 'due_date')
&& (state.experiment_id.length === 0)) {
$('.filter-container').removeClass('filters-applied');
resetMarkAppliedFilters();
} else {
$('.filter-container').addClass('filters-applied');
}
@ -72,10 +76,8 @@ var DasboardCurrentTasksWidget = (function() {
mode: $('.current-tasks-navbar .active').data('mode')
};
if (filterState) {
markAppliedFilters(filterState);
localStorage.setItem('current_tasks_filters_per_team/' + teamId, JSON.stringify(filterState));
}
markAppliedFilters(filterState);
localStorage.setItem('current_tasks_filters_per_team/' + teamId, JSON.stringify(filterState));
}
function filterStateLoad() {
@ -104,9 +106,11 @@ var DasboardCurrentTasksWidget = (function() {
markAppliedFilters(parsedFilterState);
} catch (e) {
dropdownSelector.selectValues(statusFilter, getDefaultStatusValues());
resetMarkAppliedFilters();
}
} else {
dropdownSelector.selectValues(statusFilter, getDefaultStatusValues());
resetMarkAppliedFilters();
}
}
@ -136,6 +140,15 @@ var DasboardCurrentTasksWidget = (function() {
PerfectSb().update_all();
if (newList) InfiniteScroll.resetScroll('.current-tasks-list');
animateSpinner($currentTasksList, false);
}).error(function(error) {
// If error is 403, it is possible that the user was removed from project/experiment,
// so clear local storage and filter state
if (error.status === 403) {
localStorage.removeItem('current_tasks_filters_per_team/' + $('.current-tasks-filters').data('team-id'));
$('.current-tasks-filters .clear-button').trigger('click');
resetMarkAppliedFilters();
loadCurrentTasksList();
}
});
}
@ -209,8 +222,6 @@ var DasboardCurrentTasksWidget = (function() {
$('.current-tasks-filters').dropdown('toggle');
e.stopPropagation();
e.preventDefault();
loadCurrentTasksList(true);
filterStateSave();
});
$('.filter-container').on('hide.bs.dropdown', () => {

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

@ -122,8 +122,8 @@ module Dashboard
end
def check_task_view_permissions
render_403 if @project && !can_read_project?(@project)
render_403 if @experiment && !can_read_experiment?(@experiment)
render_403 && return if @project && !can_read_project?(@project)
render_403 && return if @experiment && !can_read_experiment?(@experiment)
end
end
end