Skip to content
Snippets Groups Projects
Commit 096485ef authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre
Browse files

Creator should be added as a master of the project on creation

This also enable a project creator to add themselves as a master of the
project.
parent 481644ca
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -91,7 +91,7 @@ class Member < ActiveRecord::Base
member.invite_email = user
end
 
if can_update_member?(current_user, member)
if can_update_member?(current_user, member) || project_creator?(member, access_level)
member.created_by ||= current_user
member.access_level = access_level
 
Loading
Loading
@@ -107,6 +107,11 @@ class Member < ActiveRecord::Base
current_user.can?(:update_group_member, member) ||
current_user.can?(:update_project_member, member)
end
def project_creator?(member, access_level)
member.new_record? && member.owner? &&
access_level.to_i == ProjectMember::MASTER
end
end
 
def invite?
Loading
Loading
Loading
Loading
@@ -95,7 +95,7 @@ module Projects
system_hook_service.execute_hooks_for(@project, :create)
 
unless @project.group
@project.team << [current_user, :master]
@project.team << [current_user, :master, current_user]
end
 
@project.import_start if @project.import?
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment