jro_apps/redmine Commit - r3318:57dcbd73767a

Merged bug fixes r3412 to r3414....

Jean-Philippe Lang -

r3318:57dcbd73767a

parent child

Context file:

r3318:57dcbd73767a

app/controllers/issue_relations_controller.rb +2 -2

               def new
                 @relation = IssueRelation.new(params[:relation])
                 @relation.issue_from = @issue
-                if params[:relation] && !params[:relation][:issue_to_id].blank?
+                if params[:relation] && m = params[:relation][:issue_to_id].to_s.match(/^#?(\d+)$/)
-                  @relation.issue_to = Issue.visible.find_by_id(params[:relation][:issue_to_id])
+                  @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
                 end
                 @relation.save if request.post?
                 respond_to do |format|

app/models/project.rb +12 0

                 unless project.wiki.nil?
                   self.wiki ||= Wiki.new
                   wiki.attributes = project.wiki.attributes.dup.except("id", "project_id")
+                  wiki_pages_map = {}
                   project.wiki.pages.each do |page|
+                    # Skip pages without content
+                    next if page.content.nil?
                     new_wiki_content = WikiContent.new(page.content.attributes.dup.except("id", "page_id", "updated_on"))
                     new_wiki_page = WikiPage.new(page.attributes.dup.except("id", "wiki_id", "created_on", "parent_id"))
                     new_wiki_page.content = new_wiki_content
                     wiki.pages << new_wiki_page
+                    wiki_pages_map[page.id] = new_wiki_page
+                  end
+                  wiki.save
+                  # Reproduce page hierarchy
+                  project.wiki.pages.each do |page|
+                    if page.parent_id && wiki_pages_map[page.id]
+                      wiki_pages_map[page.id].parent = wiki_pages_map[page.parent_id]
+                      wiki_pages_map[page.id].save
+                    end
                   end
                 end
               end

public/stylesheets/application.css +1 0

               padding:0;
               margin:0;
               line-height:0.8em;
+              white-space:nowrap;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }

test/fixtures/wiki_contents.yml +24 0

test/fixtures/wiki_pages.yml +21 0

test/functional/issue_relations_controller_test.rb +18 0

@@ -40,6 +40,24 class IssueRelationsControllerTest < ActionController::TestCase
40	end	40	end
41	end	41	end
42		42
		43	def test_new_should_accept_id_with_hash
		44	assert_difference 'IssueRelation.count' do
		45	@request.session[:user_id] = 3
		46	post :new, :issue_id => 1,
		47	:relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
		48	end
		49	end
		50
		51	def test_new_should_not_break_with_non_numerical_id
		52	assert_no_difference 'IssueRelation.count' do
		53	assert_nothing_raised do
		54	@request.session[:user_id] = 3
		55	post :new, :issue_id => 1,
		56	:relation => {:issue_to_id => 'foo', :relation_type => 'relates', :delay => ''}
		57	end
		58	end
		59	end
		60
43	def test_should_create_relations_with_visible_issues_only	61	def test_should_create_relations_with_visible_issues_only
44	Setting.cross_project_issue_relations = '1'	62	Setting.cross_project_issue_relations = '1'
45	assert_nil Issue.visible(User.find(3)).find_by_id(4)	63	assert_nil Issue.visible(User.find(3)).find_by_id(4)

test/unit/project_test.rb +12 -4

                   assert_equal "Start page", @project.wiki.start_page
                 end
-                should "copy wiki pages and content" do
+                should "copy wiki pages and content with hierarchy" do
-                  assert @project.copy(@source_project)
+                  assert_difference 'WikiPage.count', @source_project.wiki.pages.size do
+                    assert @project.copy(@source_project)
+                  end
                   assert @project.wiki
-                  assert_equal 1, @project.wiki.pages.length
+                  assert_equal @source_project.wiki.pages.size, @project.wiki.pages.size
                   @project.wiki.pages.each do |wiki_page|
                     assert wiki_page.content
                     assert !@source_project.wiki.pages.include?(wiki_page)
                   end
+                  parent = @project.wiki.find_page('Parent_page')
+                  child1 = @project.wiki.find_page('Child_page_1')
+                  child2 = @project.wiki.find_page('Child_page_2')
+                  assert_equal parent, child1.parent
+                  assert_equal parent, child2.parent
                 end
                 should "copy issue categories" do

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