<!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][1144] trunk: Translation Matching: Respect permissions when propagating translations.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://glotpress.trac.wordpress.org/changeset/1144">1144</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/1144","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-11 20:42:46 +0000 (Sun, 11 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Translation Matching: Respect permissions when propagating translations.
Set the translation status to "waiting" if the current user cannot approve translations in a translation set of a matching result.
Includes unit tests and moves the cookie handler to `GP_UnitTestCase` to avoid "headers already sent" errors.
See <a href="http://glotpress.trac.wordpress.org/ticket/327">#327</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunktlibtestcaseroutephp">trunk/t/lib/testcase-route.php</a></li>
<li><a href="#trunktlibtestcasephp">trunk/t/lib/testcase.php</a></li>
<li><a href="#trunktteststests_routestest_route_translationphp">trunk/t/tests/tests_routes/test_route_translation.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_translationphp">trunk/t/tests/tests_things/test_thing_translation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesthingstranslationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/things/translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/translation.php 2015-10-11 20:33:57 UTC (rev 1143)
+++ trunk/gp-includes/things/translation.php 2015-10-11 20:42:46 UTC (rev 1144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +250,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = GP::$user->current();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $original = GP::$original->get( $this->original_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $originals_in_other_projects = $original->get_matching_originals_in_other_projects();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +270,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_translation = GP::$translation->find_no_map( array( 'translation_set_id' => $o_translation_set->id, 'original_id' => $o->id, 'status' => 'current' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $current_translation ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $copy_status = apply_filters( 'translations_to_other_projects_status', 'current' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user->logged_in() && ! $user->can( 'approve', 'translation-set', $o_translation_set->id ) ) {
+ $copy_status = 'waiting';
+ } else {
+ $copy_status = 'current';
+ }
+ $copy_status = apply_filters( 'translations_to_other_projects_status', $copy_status );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->copy_into_set( $o_translation_set->id, $o->id, $copy_status );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktlibtestcaseroutephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/lib/testcase-route.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/lib/testcase-route.php 2015-10-11 20:33:57 UTC (rev 1143)
+++ trunk/t/lib/testcase-route.php 2015-10-11 20:42:46 UTC (rev 1144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,27 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->route = new $this->route_class;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->route->fake_request = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->cookies = array();
</del><span class="cx" style="display: block; padding: 0 10px"> $this->route->errors = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->route->notices = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'backpress_set_cookie', array( &$this, 'filter_do_not_set_cookie' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tearDown() {
- parent::tearDown();
- remove_filter( 'backpress_set_cookie', array( &$this, 'filter_do_not_set_cookie' ) );
- }
-
- function filter_do_not_set_cookie( $args ) {
- if ( isset( $args[0] ) && !isset( $args[1] ) && isset( $this->cookies[$args[0]] ) ) {
- unset( $this->cookies[$args[0]] );
- }
- if ( isset( $args[0] ) && isset( $args[1] ) ) {
- $this->cookies[$args[0]] = $args[1];
- }
- return false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function assertRedirected() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->route->redirected, "Wasn't redirected" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktlibtestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/lib/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/lib/testcase.php 2015-10-11 20:33:57 UTC (rev 1143)
+++ trunk/t/lib/testcase.php 2015-10-11 20:42:46 UTC (rev 1144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected $backupGlobalsBlacklist = array( 'gpdb' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $cookies;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var $url = 'http://example.org/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,18 +39,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'GP_IS_TEST_DB_INSTALLED', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->cookies = array();
+ add_filter( 'backpress_set_cookie', array( $this, 'capture_cookies' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->factory = new GP_UnitTest_Factory;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->clean_up_global_scope();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->start_transaction();
</span><span class="cx" style="display: block; padding: 0 10px"> ini_set( 'display_errors', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->url_filter = returner( $this->url );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gp_get_option_uri', $this->url_filter );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $gpdb, $wp_auth_object;
</ins><span class="cx" style="display: block; padding: 0 10px"> $gpdb->query( 'ROLLBACK' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'gp_get_option_uri', $this->url_filter );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'backpress_set_cookie', array( &$this, 'filter_do_not_set_cookie' ) );
+ $wp_auth_object->set_current_user( 0 );
+ $wp_auth_object->clear_auth_cookie();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function clean_up_global_scope() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,6 +94,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $gpdb->query( 'START TRANSACTION;' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function capture_cookies( $args ) {
+ if ( isset( $args[0] ) && !isset( $args[1] ) && isset( $this->cookies[$args[0]] ) ) {
+ unset( $this->cookies[$args[0]] );
+ }
+
+ if ( isset( $args[0] ) && isset( $args[1] ) ) {
+ $this->cookies[$args[0]] = $args[1];
+ }
+
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function temp_filename() {
</span><span class="cx" style="display: block; padding: 0 10px"> $tmp_dir = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
</span></span></pre></div>
<a id="trunktteststests_routestest_route_translationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/tests/tests_routes/test_route_translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/tests_routes/test_route_translation.php 2015-10-11 20:33:57 UTC (rev 1143)
+++ trunk/t/tests/tests_routes/test_route_translation.php 2015-10-11 20:42:46 UTC (rev 1144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 327
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_discard_warning_edit_function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_admin_user_as_current();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project2 = $this->factory->project->create( array( 'name'=>'project_two' ) );
</span></span></pre></div>
<a id="trunktteststests_thingstest_thing_translationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/tests/tests_things/test_thing_translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/tests_things/test_thing_translation.php 2015-10-11 20:33:57 UTC (rev 1143)
+++ trunk/t/tests/tests_things/test_thing_translation.php 2015-10-11 20:42:46 UTC (rev 1144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,11 +104,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_propagate_across_projects_propagates() {
</span><span class="cx" style="display: block; padding: 0 10px"> $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $project2 = $this->factory->project->create( array('name'=>'project_two') );
</span><span class="cx" style="display: block; padding: 0 10px"> $set2 = $this->factory->translation_set->create( array('locale'=>$set1->locale, 'project_id'=>$project2->id) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,12 +161,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $project3 = $this->factory->project->create( array('name'=>'project_three') );
</span><span class="cx" style="display: block; padding: 0 10px"> $set3 = $this->factory->translation_set->create( array('locale' => $set1->locale, 'project_id' => $project3->id) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $original3 = $this->factory->original->create( array( 'project_id' => $set3->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation2 = $this->factory->translation->create( array( 'translation_set_id' => $set2->id, 'original_id' => $original2->id, 'status' => 'current' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,4 +175,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $set3_current_translations ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 327
+ */
+ function test_propagate_across_projects_with_missing_permissions() {
+ $user = $this->factory->user->create();
+ add_filter( 'backpress_set_cookie', '__return_false' );
+ $user->set_as_current();
+ remove_filter( 'backpress_set_cookie', '__return_false' );
+
+ $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
+
+ $project2 = $this->factory->project->create( array( 'name'=>'project_two' ) );
+ $set2 = $this->factory->translation_set->create( array( 'locale' => $set1->locale, 'project_id' => $project2->id ) );
+
+ // User has only validator permissions for project 1
+ GP::$validator_permission->create( array(
+ 'user_id' => $user->id,
+ 'action' => 'approve',
+ 'project_id' => $set1->project_id,
+ 'locale_slug' => $set1->locale,
+ 'set_slug' => $set1->slug,
+ ) );
+
+ $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+
+ $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'current' ) );
+ $translation1->set_as_current(); //calls propagate_across_projects
+
+ $set2_current_translations = GP::$translation->for_export( $project2, $set2, array( 'status' => 'current' ) );
+ $this->assertEquals( 0, count( $set2_current_translations ) );
+
+ $set2_current_translations = GP::$translation->for_export( $project2, $set2, array( 'status' => 'waiting' ) );
+ $this->assertEquals( 1, count( $set2_current_translations ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>