jro_apps/redmine Commit - r13465:5d2eea14893b

Cleans up parent project assignment in ProjectsController....

Jean-Philippe Lang -

r13465:5d2eea14893b

parent child

Context file:

r13465:5d2eea14893b

Collapse all files

app/controllers/projects_controller.rb +3 -23

                 @project = Project.new
                 @project.safe_attributes = params[:project]
-                if validate_parent_id && @project.save
+                if @project.save
-                  @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                   unless User.current.admin?
                     @project.add_default_member(User.current)
                   end
                   Mailer.with_deliveries(params[:notifications] == '1') do
                     @project = Project.new
                     @project.safe_attributes = params[:project]
-                    if validate_parent_id && @project.copy(@source_project, :only => params[:only])
+                    if @project.copy(@source_project, :only => params[:only])
-                      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to settings_project_path(@project)
                     elsif !@project.new_record?
               def update
                 @project.safe_attributes = params[:project]
-                if validate_parent_id && @project.save
+                if @project.save
-                  @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                 # hide project in layout
                 @project = nil
               end
-              private
-              # Validates parent_id param according to user's permissions
-              # TODO: move it to Project model in a validation that depends on User.current
-              def validate_parent_id
-                return true if User.current.admin?
-                parent_id = params[:project] && params[:project][:parent_id]
-                if parent_id || @project.new_record?
-                  parent = parent_id.blank? ? nil : Project.find_by_id(parent_id.to_i)
-                  unless @project.allowed_parents.include?(parent)
-                    @project.errors.add :parent_id, :invalid
-                    return false
-                  end
-                end
-                true
-              end
             end

app/models/project.rb +44 -38

@@ -80,9 +80,11 class Project < ActiveRecord::Base
80	validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :if => Proc.new { \|p\| p.identifier_changed? }	80	validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :if => Proc.new { \|p\| p.identifier_changed? }
81	# reserved words	81	# reserved words
82	validates_exclusion_of :identifier, :in => %w( new )	82	validates_exclusion_of :identifier, :in => %w( new )
		83	validate :validate_parent
83		84
84	after_save :update_inherited_members, :if => Proc.new {\|project\| project.inherit_members_changed?}	85	after_save :update_inherited_members, :if => Proc.new {\|project\| project.inherit_members_changed?}
85	after_save :remove_inherited_member_roles, :add_inherited_member_roles, :if => Proc.new {\|project\| project.parent_id_changed?}	86	after_save :remove_inherited_member_roles, :add_inherited_member_roles, :if => Proc.new {\|project\| project.parent_id_changed?}
		87	after_update :update_versions_from_hierarchy_change, :if => Proc.new {\|project\| project.parent_id_changed?}
86	before_destroy :delete_all_members	88	before_destroy :delete_all_members
87		89
88	scope :has_module, lambda {\|mod\|	90	scope :has_module, lambda {\|mod\|
@@ -366,11 +368,11 class Project < ActiveRecord::Base
366		368
367	# Returns an array of projects the project can be moved to	369	# Returns an array of projects the project can be moved to
368	# by the current user	370	# by the current user
369	def allowed_parents	371	def allowed_parents(user=User.current)
370	return @allowed_parents if @allowed_parents	372	return @allowed_parents if @allowed_parents
371	@allowed_parents = Project.allowed_to(~~User~~.~~current~~, :add_subprojects).to_a	373	@allowed_parents = Project.allowed_to(user, :add_subprojects).to_a
372	@allowed_parents = @allowed_parents - self_and_descendants	374	@allowed_parents = @allowed_parents - self_and_descendants
373	if ~~User~~.~~current~~.allowed_to?(:add_project, nil, :global => true) \|\| (!new_record? && parent.nil?)	375	if user.allowed_to?(:add_project, nil, :global => true) \|\| (!new_record? && parent.nil?)
374	@allowed_parents << nil	376	@allowed_parents << nil
375	end	377	end
376	unless parent.nil? \|\| @allowed_parents.empty? \|\| @allowed_parents.include?(parent)	378	unless parent.nil? \|\| @allowed_parents.empty? \|\| @allowed_parents.include?(parent)
@@ -381,48 +383,20 class Project < ActiveRecord::Base
381		383
382	# Sets the parent of the project with authorization check	384	# Sets the parent of the project with authorization check
383	def set_allowed_parent!(p)	385	def set_allowed_parent!(p)
384	~~unless~~ p.~~nil?~~ \|\| p.is_a?(Project)	386	p = p.id if p.is_a?(Project)
385	if p.to_s.blank?	387	send :safe_attributes, {:project_id => p}
386	p = nil	388	save
387	else
388	p = Project.find_by_id(p)
389	return false unless p
390	end
391	end
392	if p.nil?
393	if !new_record? && allowed_parents.empty?
394	return false
395	end
396	elsif !allowed_parents.include?(p)
397	return false
398	end
399	set_parent!(p)
400	end	389	end
401		390
402	# Sets the parent of the project	391	# Sets the parent of the project
403	# Argument can be either a Project, a String, a Fixnum or nil	392	# Argument can be either a Project, a String, a Fixnum or nil
404	def set_parent!(p)	393	def set_parent!(p)
405	~~unless~~ p.~~nil?~~ \|\| p.is_a?(Project)	394	if p.is_a?(Project)
406	if p.to_s.blank?
407	p = nil
408	else
409	p = Project.find_by_id(p)
410	return false unless p
411	end
412	end
413	if p == parent && !p.nil?
414	# Nothing to do
415	true
416	elsif p.nil? \|\| (p.active? && move_possible?(p))
417	self.parent = p	395	self.parent = p
418	save
419	p.reload if p
420	Issue.update_versions_from_hierarchy_change(self)
421	true
422	else	396	else
423	# Can not move to the given target	397	self.parent_id = p
424	false
425	end	398	end
		399	save
426	end	400	end
427		401
428	# Returns an array of the trackers used by the project and its active sub projects	402	# Returns an array of the trackers used by the project and its active sub projects
@@ -688,7 +662,8 class Project < ActiveRecord::Base
688	'custom_field_values',	662	'custom_field_values',
689	'custom_fields',	663	'custom_fields',
690	'tracker_ids',	664	'tracker_ids',
691	'issue_custom_field_ids'	665	'issue_custom_field_ids',
		666	'parent_id'
692		667
693	safe_attributes 'enabled_module_names',	668	safe_attributes 'enabled_module_names',
694	:if => lambda {\|project, user\| project.new_record? \|\| user.allowed_to?(:select_project_modules, project) }	669	:if => lambda {\|project, user\| project.new_record? \|\| user.allowed_to?(:select_project_modules, project) }
@@ -696,6 +671,23 class Project < ActiveRecord::Base
696	safe_attributes 'inherit_members',	671	safe_attributes 'inherit_members',
697	:if => lambda {\|project, user\| project.parent.nil? \|\| project.parent.visible?(user)}	672	:if => lambda {\|project, user\| project.parent.nil? \|\| project.parent.visible?(user)}
698		673
		674	def safe_attributes=(attrs, user=User.current)
		675	return unless attrs.is_a?(Hash)
		676	attrs = attrs.deep_dup
		677
		678	@unallowed_parent_id = nil
		679	parent_id_param = attrs['parent_id'].to_s
		680	if parent_id_param.blank? \|\| parent_id_param != parent_id.to_s
		681	p = parent_id_param.present? ? Project.find_by_id(parent_id_param) : nil
		682	unless allowed_parents(user).include?(p)
		683	attrs.delete('parent_id')
		684	@unallowed_parent_id = true
		685	end
		686	end
		687
		688	super(attrs, user)
		689	end
		690
699	# Returns an auto-generated project identifier based on the last identifier used	691	# Returns an auto-generated project identifier based on the last identifier used
700	def self.next_identifier	692	def self.next_identifier
701	p = Project.order('id DESC').first	693	p = Project.order('id DESC').first
@@ -797,6 +789,20 class Project < ActiveRecord::Base
797	end	789	end
798	end	790	end
799		791
		792	def update_versions_from_hierarchy_change
		793	Issue.update_versions_from_hierarchy_change(self)
		794	end
		795
		796	def validate_parent
		797	if @unallowed_parent_id
		798	errors.add(:parent_id, :invalid)
		799	elsif parent_id_changed?
		800	unless parent.nil? \|\| (parent.active? && move_possible?(parent))
		801	errors.add(:parent_id, :invalid)
		802	end
		803	end
		804	end
		805
800	# Copies wiki from +project+	806	# Copies wiki from +project+
801	def copy_wiki(project)	807	def copy_wiki(project)
802	# Check that the source project has a wiki first	808	# Check that the source project has a wiki first

test/object_helpers.rb +4 -2

               end
               def Project.generate_with_parent!(parent, attributes={})
-                project = Project.generate!(attributes)
+                project = Project.generate!(attributes) do |p|
-                project.set_parent!(parent)
+                  p.parent = parent
+                end
+                parent.reload if parent
                 project
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages