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

Fix filter label on webhook page [SCI-9752]

Browse source
This commit is contained in:
Andrej 2023-12-19 10:35:02 +01:00
parent 668ae018c1
commit 436be9cbdd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/global_activities_controller.rb
View file

@ -8,8 +8,8 @@ class GlobalActivitiesController < ApplicationController
def index
# Preload filter format
# {
# from_date: "YYYY-MM-DD",
# to_date: "YYYY-MM-DD",
# from_date: "YYYY-MM-DD",
# teams: [*team_ids],
# types: [*activity_type_ids],
# users: [*user_ids],
@ -21,8 +21,8 @@ class GlobalActivitiesController < ApplicationController
# Example
# {
# to_date: "2018-02-28",
# from_date: "2019-03-29",
# to_date: "2019-03-29",
# teams: [1,2],
# types: [32,33,34],
# users: [1,2,3],

2
app/controllers/users/settings/webhooks_controller.rb
View file

@ -87,7 +87,7 @@ module Users
end
if filters['to_date'] || filters['from_date']
result.push("#{t('global_activities.index.period_label')} #{filters['from_date']} - #{filters['to_date']}")
result.push("#{t('global_activities.index.period_label')} #{filters['to_date']} - #{filters['from_date']}")
end
filters['subjects']&.each do |subject, ids|