修复当前用户为超级管理员时,创建项目后,在个人信息的参与项目栏内无该项目的记录

GitlabVersion
sw 11 years ago
parent 31245f6fb2
commit ef95835bc6

@ -574,10 +574,11 @@ class ProjectsController < ApplicationController
end end
end end
else else
#@project.memberships.create
if validate_parent_id && @project.save if validate_parent_id && @project.save
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
# Add current user as a project member if he is not admin # Add current user as a project member if he is not admin
unless User.current.admin? #unless User.current.admin?
r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
m = Member.new(:user => User.current, :roles => [r]) m = Member.new(:user => User.current, :roles => [r])
project = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id) project = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id)
@ -587,7 +588,7 @@ class ProjectsController < ApplicationController
end end
@project.members << m @project.members << m
@project.project_infos << project @project.project_infos << project
end #end
respond_to do |format| respond_to do |format|
format.html { format.html {
flash[:notice] = l(:notice_successful_create) flash[:notice] = l(:notice_successful_create)

Loading…
Cancel
Save