scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5043 from aignatov-bio/ai-sci-8019-fix-user-invitation

Browse source 
Fix protocol public assignments [SCI-8019]
This commit is contained in:
aignatov-bio 2023-02-28 15:18:12 +01:00 committed by GitHub
commit 7c51cba245
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/access_permissions/protocols_controller.rb
View file

@ -99,7 +99,7 @@ module AccessPermissions
@protocol.assign_attributes(permitted_default_public_user_role_params)
@protocol.save!
UserAssignments::ProjectGroupAssignmentJob.perform_later(current_team, @project, current_user)
UserAssignments::ProtocolGroupAssignmentJob.perform_later(current_team, @protocol, current_user)
end
end

6
app/models/team.rb
View file

@ -38,9 +38,9 @@ class Team < ApplicationRecord
has_many :protocols, inverse_of: :team, dependent: :destroy
has_many :repository_protocols,
(lambda do
where(protocol_type: [Protocol.protocol_types[:in_repository_public],
Protocol.protocol_types[:in_repository_private],
Protocol.protocol_types[:in_repository_archived]])
where(protocol_type: %i(in_repository_published_original
in_repository_draft
in_repository_published_version))
end),
class_name: 'Protocol'
has_many :protocol_keywords, inverse_of: :team, dependent: :destroy