<!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>[4427] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php: Translate, Rosetta Roles: In the waiting tab, restore showing projects for validators of base level projects like wp-plugins or wp-themes.</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="http://meta.trac.wordpress.org/changeset/4427">4427</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/4427","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>2016-11-27 11:15:12 +0000 (Sun, 27 Nov 2016)</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'>Translate, Rosetta Roles: In the waiting tab, restore showing projects for validators of base level projects like wp-plugins or wp-themes.
This is a follow-up to <a href="http://meta.trac.wordpress.org/changeset/4378">[4378]</a> which removed support for including thousands of project IDs in one query. The request queries now `parent_project_id` directly.
See <a href="http://meta.trac.wordpress.org/ticket/2255">#2255</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php 2016-11-27 08:07:40 UTC (rev 4426)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php 2016-11-27 11:15:12 UTC (rev 4427)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,11 +591,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Global Admin or Locale-specific admin
</span><span class="cx" style="display: block; padding: 0 10px"> $can_approve_for_all = $this->roles_adapter->is_global_administrator( $user_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">- // Check to see if they have any special approval permissions
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Limit to only showing base-level projects.
+ $base_level_project_sql = '';
+ $base_level_project_ids = $wpdb->get_col( "SELECT id FROM {$wpdb->gp_projects} WHERE parent_project_id IS NULL AND active = 1" );
+ if ( $base_level_project_ids ) {
+ $ids = implode( ', ', array_map( 'intval', $base_level_project_ids ) );
+ $base_level_project_sql = " AND tp.parent_project_id IN( $ids )";
+ }
+
+ // Check to see if they have any special approval permissions.
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_projects = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $can_approve_for_all && $role = $this->roles_adapter->is_approver_for_locale( $user_id, $locale ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_projects = $this->roles_adapter->get_project_id_access_list( $user_id, $locale );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_base_level_projects = array_intersect( $allowed_projects, $base_level_project_ids );
+ $allowed_projects = array_diff( $allowed_projects, $base_level_project_ids );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check to see if they can approve for all projects in this locale.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( Rosetta_Roles::LOCALE_MANAGER_ROLE === $role || in_array( 'all', $allowed_projects ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $can_approve_for_all = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,21 +617,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_approve_for_all ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The current user can approve for all projects, so just grab all with any waiting strings.
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_project_sql = 'AND ( stats.waiting > 0 OR stats.fuzzy > 0 )';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_project_sql .= $base_level_project_sql;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $allowed_projects ) {
- // The current user can approve for a small set of projects.
- // We only need to check against tp.id and not tp_sub.id in this case as we've overriding the parent_project_id check
- $ids = implode( ', ', array_map( 'intval', $allowed_projects ) );
- $parent_project_sql = "AND tp.id IN( $ids ) AND stats.waiting > 0";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $allowed_projects || $allowed_base_level_projects ) {
+ $parent_project_sql = 'AND stats.waiting > 0 AND ( (';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $allowed_projects ) {
+ /*
+ * The current user can approve for a small set of projects.
+ * We only need to check against tp.id and not tp_sub.id in this case as we've overriding the parent_project_id check.
+ */
+ $ids = implode( ', ', array_map( 'intval', $allowed_projects ) );
+ $parent_project_sql .= "tp.id IN( $ids )";
+ $parent_project_sql .= $base_level_project_sql;
+ } else {
+ $parent_project_sql .= '0=1';
+ }
+
+ $parent_project_sql .= ") OR (";
+
+ if ( $allowed_base_level_projects ) {
+ /*
+ * The current user can approve all sub-projects of a base level project.
+ */
+ $ids = implode( ', ', array_map( 'intval', $allowed_base_level_projects ) );
+ $parent_project_sql .= "tp.parent_project_id IN( $ids )";
+ } else {
+ $parent_project_sql .= '0=1';
+ }
+
+ $parent_project_sql .= ") )";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // The current user can't approve for any locale projects, or is logged out.
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_project_sql = 'AND 0=1';
</span><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">-
- // Limit to only showing base-level projects
- $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$wpdb->gp_projects} WHERE parent_project_id IS NULL AND active = 1) )";
</del><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"> $filter_order_by = $filter_where = '';
</span></span></pre>
</div>
</div>
</body>
</html>