From a2623b512427406753be4eab071313bf68b13e28 Mon Sep 17 00:00:00 2001 From: Jure Grabnar Date: Tue, 2 Apr 2019 14:20:01 +0200 Subject: [PATCH 1/2] Fix non-existant current_team in WOPI create_activity Closes SCI-3279 --- app/utilities/wopi_util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/utilities/wopi_util.rb b/app/utilities/wopi_util.rb index b9d0d5a98..8a1d04ca1 100644 --- a/app/utilities/wopi_util.rb +++ b/app/utilities/wopi_util.rb @@ -96,7 +96,7 @@ module WopiUtil .call(activity_type: type_of, owner: current_user, subject: @protocol, - team: current_team, + team: @protocol.my_module.experiment.project.team, project: project, message_items: message_items) elsif @assoc.class == Result From 22d193114e8a5eec76aa41cc1bdf4bbc2a6448c3 Mon Sep 17 00:00:00 2001 From: Jure Grabnar Date: Tue, 2 Apr 2019 16:10:20 +0200 Subject: [PATCH 2/2] Add asset to activity message item type Closes SCI-3283 --- config/initializers/extends.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index e07d05600..8e9c5ff27 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -104,7 +104,7 @@ class Extends }.freeze ACTIVITY_MESSAGE_ITEMS_TYPES = - ACTIVITY_SUBJECT_TYPES + %w(User Tag RepositoryColumn RepositoryRow Step) + ACTIVITY_SUBJECT_TYPES + %w(User Tag RepositoryColumn RepositoryRow Step Asset) .freeze ACTIVITY_TYPES = {