jro_apps/redmine Commit - r14268:e8a00fd2b458

Merged r14619 (#20282)....

Jean-Philippe Lang -

r14268:e8a00fd2b458

parent child

Context file:

r14268:e8a00fd2b458

app/models/project.rb +8 -6

                  attrs = attrs.deep_dup
                  @unallowed_parent_id = nil
-                 parent_id_param = attrs['parent_id'].to_s
-                 if parent_id_param.blank? || parent_id_param != parent_id.to_s
-                   p = parent_id_param.present? ? Project.find_by_id(parent_id_param) : nil
-                   unless allowed_parents(user).include?(p)
-                     attrs.delete('parent_id')
-                     @unallowed_parent_id = true
+                 if new_record? || attrs.key?('parent_id')
+                   parent_id_param = attrs['parent_id'].to_s
+                   if new_record? || parent_id_param != parent_id.to_s
+                     p = parent_id_param.present? ? Project.find_by_id(parent_id_param) : nil
+                     unless allowed_parents(user).include?(p)
+                       attrs.delete('parent_id')
+                       @unallowed_parent_id = true
+                     end
                    end
                  end

test/functional/projects_controller_test.rb +11 0

                  assert_equal 'eCookbook', Project.find(1).name
                end
+               def test_update_child_project_without_parent_permission_should_not_show_validation_error
+                 child = Project.generate_with_parent!
+                 user = User.generate!
+                 User.add_to_project(user, child, Role.generate!(:permissions => [:edit_project]))
+                 @request.session[:user_id] = user.id
+                 post :update, :id => child.id, :project => {:name => 'Updated'}
+                 assert_response 302
+                 assert_match /Successful update/, flash[:notice]
+               end
                def test_modules
                  @request.session[:user_id] = 2
                  Project.find(1).enabled_module_names = ['issue_tracking', 'news']

test/object_helpers.rb +4 -1

                  project
                end
-               def Project.generate_with_parent!(parent, attributes={})
+               def Project.generate_with_parent!(*args)
+                 attributes = args.last.is_a?(Hash) ? args.pop : {}
+                 parent = args.size > 0 ? args.first : Project.generate!
                  project = Project.generate!(attributes) do |p|
                    p.parent = parent
                  end

General Comments 0

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

No TODOs yet

	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