From 01ffb43c23d4c6e8f7328ddde144158091ffeb15 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Tue, 2 Apr 2019 18:37:55 +0200 Subject: [PATCH 1/2] Include old activites assigned to the task [SCI-3285] --- app/services/activities_service.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/services/activities_service.rb b/app/services/activities_service.rb index fafe747c4..b81dc24d1 100644 --- a/app/services/activities_service.rb +++ b/app/services/activities_service.rb @@ -13,10 +13,13 @@ class ActivitiesService query = query.where('project_id IN (?)', subjects_with_children[:Project]) subjects_with_children.except!(:Project) end - query = query.where( - subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR '), - *subjects_with_children.flatten - ) + where_condition = subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR ') + where_arguments = subjects_with_children.flatten + if subjects_with_children[:MyModule] + where_condition = where_condition.concat(' OR (my_module_id IN(?))') + where_arguments << subjects_with_children[:MyModule] + end + query = query.where(where_condition, *where_arguments) end query = query.where(owner_id: filters[:users]) if filters[:users] From 8c2b2513b0d4b725e3e0ae07d5676b5bed8d8d87 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 3 Apr 2019 12:53:52 +0200 Subject: [PATCH 2/2] Fix user popup in global activities [SCI-3285] --- app/helpers/global_activities_helper.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/helpers/global_activities_helper.rb b/app/helpers/global_activities_helper.rb index 69c9a3b69..7ca35363b 100644 --- a/app/helpers/global_activities_helper.rb +++ b/app/helpers/global_activities_helper.rb @@ -17,8 +17,10 @@ module GlobalActivitiesHelper no_links ? generate_name(value) : generate_link(value, activity) end end - sanitize_input(I18n.t("global_activities.content.#{activity.type_of}_html", - parameters.symbolize_keys)) + custom_auto_link( + I18n.t("global_activities.content.#{activity.type_of}_html", parameters.symbolize_keys), + team: activity.team + ) end def generate_link(message_item, activity) @@ -31,7 +33,7 @@ module GlobalActivitiesHelper case obj when User - return popover_for_user_name(obj, team, false, true) + return "[@#{obj.full_name}~#{obj.id.base62_encode}]" when Tag # Not link for now return current_value