scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix next page loading for global and task activities [SCI-9175]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2023-09-15 12:32:15 +02:00
parent 5928f708e1
commit 4e16d702bd
7 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,6 @@
ev.preventDefault();
animateSpinner(null, true);
filters.page = moreButton.data('next-page');
filters.starting_timestamp = $('.ga-activities-list').data('starting-timestamp');
$.ajax({
url: $('.ga-activities-list').data('activities-url'),
data: filters,

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

@ -287,7 +287,6 @@ var globalActivities = (function() {
} else {
noActivitiesMessage.addClass('hidden');
}
$('.ga-activities-list').data('starting-timestamp', json.starting_timestamp);
updateRunning = false;
animateSpinner('.ga-main', false);

6
app/controllers/global_activities_controller.rb
View file

@ -49,14 +49,12 @@ class GlobalActivitiesController < ApplicationController
end
@next_page = activities.next_page
@starting_timestamp = activities.first&.created_at.to_i
respond_to do |format|
format.json do
render json: {
activities_html: render_to_string(partial: 'activity_list', formats: :html),
next_page: @next_page,
starting_timestamp: @starting_timestamp
next_page: @next_page
}
end
format.html do
@ -154,7 +152,7 @@ class GlobalActivitiesController < ApplicationController
def activity_filters
params.permit(
:page, :starting_timestamp, :from_date, :to_date, types: [], subjects: {}, users: [], teams: []
:page, :from_date, :to_date, types: [], subjects: {}, users: [], teams: []
)
end

6
app/controllers/my_modules_controller.rb
View file

@ -123,7 +123,6 @@ class MyModulesController < ApplicationController
end
@next_page = activities.next_page
@starting_timestamp = activities.first&.created_at.to_i
respond_to do |format|
format.json do
@ -132,8 +131,7 @@ class MyModulesController < ApplicationController
partial: 'global_activities/activity_list',
formats: :html
),
next_page: @next_page,
starting_timestamp: @starting_timestamp
next_page: @next_page
}
end
format.html
@ -562,7 +560,7 @@ class MyModulesController < ApplicationController
def activity_filters
params.permit(
:page, :starting_timestamp, :from_date, :to_date, types: [], users: [], subjects: {}
:page, :from_date, :to_date, types: [], users: [], subjects: {}
)
end

2
app/services/activities_service.rb
View file

@ -30,8 +30,6 @@ class ActivitiesService
query = query.where(owner_id: filters[:users]) if filters[:users]
query = query.where(type_of: filters[:types].map(&:to_i)) if filters[:types]
query = query.where('created_at <= ?', Time.at(filters[:starting_timestamp].to_i)) if filters[:starting_timestamp]
activities =
if filters[:from_date].present? && filters[:to_date].present?
query.where('created_at <= :from AND created_at >= :to',

4
app/views/global_activities/index.html.erb
View file

@ -11,9 +11,7 @@
<div class="no-activities-message text-center <%= 'hidden' if @grouped_activities.keys.any? %>">
<p><%= t('activities.index.no_activities_message') %></p>
</div>
<div class="ga-activities-list"
data-activities-url="<%= global_activities_path %>"
data-starting-timestamp="<%= @starting_timestamp %>">
<div class="ga-activities-list" data-activities-url="<%= global_activities_path %>">
<%= render partial: "activity_list" %>
</div>
<div class="text-center">

4
app/views/my_modules/activities.html.erb
View file

@ -25,9 +25,7 @@
<div class="no-activities-message text-center <%= 'hidden' if @grouped_activities.keys.any? %>">
<p><%= t('activities.index.no_activities_task_message') %></p>
</div>
<div class="ga-activities-list"
data-activities-url="<%= activities_my_module_path(@my_module) %>"
data-starting-timestamp="<%= @starting_timestamp %>">
<div class="ga-activities-list" data-activities-url="<%= activities_my_module_path(@my_module) %>">
<%= render partial: "global_activities/activity_list" %>
</div>
<div class="text-center">