mirror of
https://github.com/meineerde/redmine.git
synced 2026-02-01 03:57:15 +00:00
Moved controller code to new method Project#add_default_member.
git-svn-id: http://svn.redmine.org/redmine/trunk@13542 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
f5e5822945
commit
4f4a019beb
@ -76,11 +76,8 @@ class ProjectsController < ApplicationController
|
||||
|
||||
if validate_parent_id && @project.save
|
||||
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
|
||||
# Add current user as a project member if current user is not admin
|
||||
unless User.current.admin?
|
||||
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])
|
||||
@project.members << m
|
||||
@project.add_default_member(User.current)
|
||||
end
|
||||
respond_to do |format|
|
||||
format.html {
|
||||
|
||||
@ -499,6 +499,15 @@ class Project < ActiveRecord::Base
|
||||
end
|
||||
end
|
||||
|
||||
# Adds user as a project member with the default role
|
||||
# Used for when a non-admin user creates a project
|
||||
def add_default_member(user)
|
||||
role = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
|
||||
member = Member.new(:project => self, :principal => user, :roles => [role])
|
||||
self.members << member
|
||||
member
|
||||
end
|
||||
|
||||
# Deletes all project's members
|
||||
def delete_all_members
|
||||
me, mr = Member.table_name, MemberRole.table_name
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user