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

Fix duplicate entries for recent work [SCI-7641]

Browse source
This commit is contained in:
Martin Artnik 2022-12-20 14:32:22 +01:00
parent b07e108d94
commit 45aad7f429
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/services/dashboard/recent_work_service.rb
View file

@ -93,11 +93,10 @@ module Dashboard
ordered_query = Activity.from("(#{query.to_sql}) AS activities").where.not(group_id: nil)
.select(:group_id,
:subject_id,
:name,
'MAX(last_change) AS last_change',
'MAX(report_project_id) AS report_project_id')
.group(:group_id, :subject_id, :name)
.group(:group_id, :name)
.order('MAX(last_change) DESC').limit(Constants::SEARCH_LIMIT)
query_filter = "(group_id LIKE 'tsk%' OR group_id LIKE 'exp%' OR group_id LIKE 'pro%')" if @mode == 'projects'
@ -119,7 +118,7 @@ module Dashboard
recent_object[:name] = escape_input(recent_object[:name])
recent_object[:type] = I18n.t("activerecord.models.#{object_class.name.underscore}")
if object_class.include?(PrefixedIdModel)
recent_object[:code] = object_class::ID_PREFIX + recent_object[:subject_id].to_s
recent_object[:code] = object_class::ID_PREFIX + recent_object[:group_id][3..]
end
recent_object[:url] = generate_url(recent_object)
recent_object