<!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>[8496] sites/trunk/wordpress.org/public_html/wp-content/plugins: Translate: Add a filter to limit waiting view to projects without an assigned editor.</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 { white-space: pre-line; 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/8496">8496</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/8496","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>2019-03-24 15:15:29 +0000 (Sun, 24 Mar 2019)</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: Add a filter to limit waiting view to projects without an assigned editor.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3586">#3586</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-projects.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css</a></li>
<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_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectsphp"></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-customizations/templates/locale-projects.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-customizations/templates/locale-projects.php 2019-03-23 19:09:54 UTC (rev 8495)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-projects.php 2019-03-24 15:15:29 UTC (rev 8496)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="sort-bar">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="sort-filter" action="" method="GET">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="s" value="<?php echo esc_attr( $search ?? '' ); ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="page" value="1">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php if ( 'waiting' === $project->slug && is_user_logged_in() ) { ?>
+ <input id="filter-without-editors" type="checkbox" name="without-editors" value="1"<?php checked( isset( $_GET['without-editors'] ) ); ?>>
+ <label for="filter-without-editors">Limit to projects without editors</label>
+ <span class="filter-sep" aria-hidden="true">|</span>
+ <?php } ?>
+
+ <label for="filter">Filter:</label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <select id="filter" name="filter">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $sorts = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,16 +119,9 @@
</span><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"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="submit">Submit</button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<script>
- var filterForm = document.getElementById( 'sort-filter' );
- var filterSelect = document.getElementById( 'filter' );
- filterSelect.addEventListener( 'change', function() {
- filterForm.submit()
- } );
-</script>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div id="projects" class="projects">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sub_projects as $sub_project ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss"></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-customizations/templates/style.css</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-customizations/templates/style.css 2019-03-23 19:09:54 UTC (rev 8495)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css 2019-03-24 15:15:29 UTC (rev 8496)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1429,6 +1429,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-top: none;
</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">+.sort-bar label {
+ font-size: 12px;
+ line-height: 14px;
+}
+
+.sort-bar .filter-sep {
+ color: #ccc;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .project-sub-page h3 {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 30px 0 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1.2em;
</span></span></pre></div>
<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 2019-03-23 19:09:54 UTC (rev 8495)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php 2019-03-24 15:15:29 UTC (rev 8496)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page = (int) gp_get( 'page', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $search = gp_get( 's', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = gp_get( 'filter', false );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $without_editors = gp_get( 'without-editors', false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,6 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => $per_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => $search,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => $filter,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'without_editors' => $without_editors,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'set_slug' => $set_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale' => $locale_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -697,12 +699,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'per_page' => 20,
- 'page' => 1,
- 'search' => false,
- 'set_slug' => '',
- 'locale' => '',
- 'filter' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'per_page' => 20,
+ 'page' => 1,
+ 'search' => false,
+ 'set_slug' => '',
+ 'locale' => '',
+ 'filter' => false,
+ 'without_editors' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> extract( $r, EXTR_SKIP );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,6 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if they have any special approval permissions.
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_projects = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_base_level_projects = array();
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,9 +764,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $parent_project_sql .= $base_level_project_sql;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $allowed_projects || $allowed_base_level_projects ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_project_sql = 'AND stats.waiting > 0 AND ( (';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_project_sql = 'AND ( stats.waiting > 0 OR stats.fuzzy > 0 ) AND ( (';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $allowed_projects ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,6 +798,19 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Exclude projects which have an assigned editor.
+ if ( $without_editors ) {
+ $project_ids_with_editor = $wpdb->get_col( $wpdb->prepare(
+ "SELECT DISTINCT(project_id) FROM `translate_translation_editors` WHERE (locale = %s OR locale = 'all-locales') AND project_id != 0 AND user_id != %d",
+ $locale,
+ $user_id
+ ) );
+ if ( $project_ids_with_editor ) {
+ $project_ids_with_editor = implode( ', ', array_map( 'intval', $project_ids_with_editor ) );
+ $parent_project_sql .= " AND tp.id NOT IN( $project_ids_with_editor )";
+ }
+ }
</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"> $filter_order_by = $filter_where = '';
</span></span></pre>
</div>
</div>
</body>
</html>