<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[GlotPress][875] trunk: Branching: preserve hierarchy when duplicating projects that contain multiple sub projects.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/875">875</a></dd>
<dt>Author</dt> <dd>yoavf</dd>
<dt>Date</dt> <dd>2014-04-22 08:17:53 +0000 (Tue, 22 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Branching: preserve hierarchy when duplicating projects that contain multiple sub projects. Fixes <a href="http://glotpress.trac.wordpress.org/ticket/65">#65</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingsprojectphp">trunk/gp-includes/things/project.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_projectphp">trunk/t/tests/tests_things/test_thing_project.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesthingsprojectphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/project.php (874 => 875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/project.php 2014-04-22 06:40:44 UTC (rev 874)
+++ trunk/gp-includes/things/project.php 2014-04-22 08:17:53 UTC (rev 875)
</span><span class="lines">@@ -211,22 +211,22 @@
</span><span class="cx"> $this->copy_originals_from( $source_project->id ) ;
</span><span class="cx"> $this->copy_sets_and_translations_from( $source_project->id );
</span><span class="cx">
</span><ins>+ //Keep a list of parents to preserve hierarchy
+ $parents = array();
+ $parents[$source_project->id] = $this->id;
+
</ins><span class="cx"> //Duplicate originals, translations sets and translations for the child projects
</span><del>- $running_parent_project_id = $this->id;
</del><span class="cx"> foreach ( $source_sub_projects as $sub ) {
</span><del>-
</del><span class="cx"> $copy_project = new GP_Project( $sub->fields() );
</span><del>- $copy_project->parent_project_id = $running_parent_project_id;
</del><ins>+ $copy_project->parent_project_id = $parents[$sub->parent_project_id];
+ $parent_project = $copy_project->get( $copy_project->parent_project_id );
</ins><span class="cx">
</span><del>- $parent_project = $copy_project->get( $copy_project->parent_project_id );
</del><span class="cx"> $copy_project->path = gp_url_join( $parent_project->path, $copy_project->slug );
</span><del>-
</del><span class="cx"> $copy = GP::$project->create( $copy_project );
</span><ins>+ $parents[$sub->id] = $copy->id;
</ins><span class="cx">
</span><span class="cx"> $copy->copy_originals_from( $sub->id );
</span><span class="cx"> $copy->copy_sets_and_translations_from( $sub->id );
</span><del>-
- $running_parent_project_id = $copy->id;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktteststests_thingstest_thing_projectphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests/tests_things/test_thing_project.php (874 => 875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests/tests_things/test_thing_project.php 2014-04-22 06:40:44 UTC (rev 874)
+++ trunk/t/tests/tests_things/test_thing_project.php 2014-04-22 08:17:53 UTC (rev 875)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> $root_set = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'root' ) );
</span><span class="cx"> $root = $root_set->project;
</span><span class="cx">
</span><del>- $sub_set = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'SubSub', 'parent_project_id' => $root->id ) );
</del><ins>+ $sub_set = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'Sub', 'parent_project_id' => $root->id ) );
</ins><span class="cx"> $sub = $sub_set->project;
</span><span class="cx">
</span><span class="cx"> $subsub_set = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'SubSub', 'parent_project_id' => $sub->id ) );
</span><span class="lines">@@ -226,6 +226,9 @@
</span><span class="cx"> $sub_set = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'sub', 'parent_project_id' => $root->id ) );
</span><span class="cx"> $sub = $sub_set->project;
</span><span class="cx">
</span><ins>+ $other_sub_set = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'other_sub', 'parent_project_id' => $root->id ) );
+ $other_sub = $other_sub_set->project;
+
</ins><span class="cx"> $branch = $this->factory->project->create( array( 'name' => 'branch' ) );
</span><span class="cx"> $branch->duplicate_project_contents_from( $root );
</span><span class="cx">
</span><span class="lines">@@ -235,6 +238,9 @@
</span><span class="cx"> $this->assertEquals( $branch->path, 'branch' );
</span><span class="cx"> $this->assertEquals( $sub->path, 'root/sub' );
</span><span class="cx"> $this->assertEquals( $branch_sub->path, 'branch/sub' );
</span><ins>+
+ $branch_other_sub = GP::$project->by_path('branch/other_sub');
+ $this->assertNotEquals( false, $branch_other_sub );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>