scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1630 from jbargu/jg_sci_3279_3283

Browse source 
Step with Office Online files can be deleted, asset name is shown in activities screen [SCI-3279, 3283]
This commit is contained in:
Jure Grabnar 2019-04-02 17:59:51 +02:00 committed by GitHub
parent 3a2f78d7a8 22d193114e
commit b679eb4a58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/utilities/wopi_util.rb
View file

@ -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

2
config/initializers/extends.rb
View file

@ -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 = {