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

Fix activity filter loading via URL params [SCI-7537] (#5737)

Browse source
This commit is contained in:
artoscinote 2023-07-10 13:59:15 +02:00 committed by GitHub
parent 49fd90728b
commit 5bcf31ed2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/global_activities/index.js
View file

@ -2,13 +2,6 @@
'use strict';
// eslint-disable-next-line no-unused-vars
var gaUrlQueryParams;
(function() {
gaUrlQueryParams = $('#filters').data('filters');
}());
(function() {
function initExpandCollapseAllButtons() {
$('#global-activities-colapse-all').on('click', function(ev) {

10
app/assets/javascripts/global_activities/side_pane.js
View file

@ -1,4 +1,4 @@
/* global animateSpinner gaUrlQueryParams PerfectSb dropdownSelector */
/* global animateSpinner PerfectSb dropdownSelector */
/* eslint-disable no-extend-native, no-underscore-dangle, no-use-before-define */
var globalActivities = (function() {
@ -242,9 +242,13 @@ var globalActivities = (function() {
$(tag).find('.sn-icon-close-small').click();
});
});
toggleClearButtons();
}
function preloadFilters(filters) {
if (!filters) return;
updateRunning = true;
if (filters.subject_labels) {
$.each(filters.subject_labels, (i, subject) => {
@ -354,9 +358,7 @@ var globalActivities = (function() {
GlobalActivitiesUpdateTopPaneTags();
if (typeof gaUrlQueryParams !== 'undefined' && gaUrlQueryParams) {
preloadFilters(gaUrlQueryParams);
}
preloadFilters($('#filters').data('filters'));
$('.date-selector .hot-button').click(function() {
var selectPeriod = this.dataset.period;

2
app/models/activity.rb
View file

@ -112,7 +112,7 @@ class Activity < ApplicationRecord
def self.url_search_query(filters)
result = []
filters.each do |filter, values|
result.push(values.map { |k, v| { k => v.collect(&:id) } }.to_query(filter))
result.push(values.transform_values { |v| v.collect(&:id) }.to_query(filter))
end
if filters[:subjects]
subject_labels = []