| @@ -76,11 +76,8 class ProjectsController < ApplicationController | |||||
| 76 |
|
76 | |||
| 77 | if validate_parent_id && @project.save |
|
77 | if validate_parent_id && @project.save | |
| 78 | @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') |
|
78 | @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') | |
| 79 | # Add current user as a project member if current user is not admin |
|
|||
| 80 | unless User.current.admin? |
|
79 | unless User.current.admin? | |
| 81 | r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first |
|
80 | @project.add_default_member(User.current) | |
| 82 | m = Member.new(:user => User.current, :roles => [r]) |
|
|||
| 83 | @project.members << m |
|
|||
| 84 | end |
|
81 | end | |
| 85 | respond_to do |format| |
|
82 | respond_to do |format| | |
| 86 | format.html { |
|
83 | format.html { | |
| @@ -499,6 +499,15 class Project < ActiveRecord::Base | |||||
| 499 | end |
|
499 | end | |
| 500 | end |
|
500 | end | |
| 501 |
|
501 | |||
|
|
502 | # Adds user as a project member with the default role | |||
|
|
503 | # Used for when a non-admin user creates a project | |||
|
|
504 | def add_default_member(user) | |||
|
|
505 | role = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first | |||
|
|
506 | member = Member.new(:project => self, :principal => user, :roles => [role]) | |||
|
|
507 | self.members << member | |||
|
|
508 | member | |||
|
|
509 | end | |||
|
|
510 | ||||
| 502 | # Deletes all project's members |
|
511 | # Deletes all project's members | |
| 503 | def delete_all_members |
|
512 | def delete_all_members | |
| 504 | me, mr = Member.table_name, MemberRole.table_name |
|
513 | me, mr = Member.table_name, MemberRole.table_name | |
General Comments 0
You need to be logged in to leave comments.
Login now