<!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][1102] trunk: Prevent notice when the sorting order isn't fully set in the user profile.</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/1102">1102</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/1102","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>markoheijnen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-24 18:12:46 +0000 (Fri, 24 Jul 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'>Prevent notice when the sorting order isn't fully set in the user profile.
Adds method `sort_defaults()` to GP_User for convenience.
Props yoavf, markoheijnen
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/278">#278</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesroutesprofilephp">trunk/gp-includes/routes/profile.php</a></li>
<li><a href="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunkgpincludesthingsuserphp">trunk/gp-includes/things/user.php</a></li>
<li><a href="#trunkgptemplatesprofilephp">trunk/gp-templates/profile.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesroutesprofilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/routes/profile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/routes/profile.php 2015-07-24 17:46:47 UTC (rev 1101)
+++ trunk/gp-includes/routes/profile.php 2015-07-24 18:12:46 UTC (rev 1102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,8 +15,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = (int) $_POST['per_page'];
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$user->current()->set_meta( 'per_page', $per_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_sort = $_POST['default_sort'];
- GP::$user->current()->set_meta( 'default_sort', $default_sort );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_sort = array(
+ 'by' => 'priority',
+ 'how' => 'desc'
+ );
+ $user_sort = wp_parse_args( $_POST['default_sort'], $default_sort );
+
+ GP::$user->current()->set_meta( 'default_sort', $user_sort );
</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"> $this->redirect( gp_url( '/profile' ) );
</span></span></pre></div>
<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-07-24 17:46:47 UTC (rev 1101)
+++ trunk/gp-includes/things/translation.php 2015-07-24 18:12:46 UTC (rev 1102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,13 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'random' => 'o.priority DESC, RAND()', 'translation_date_added' => 't.date_added %s', 'original_date_added' => 'o.date_added %s',
</span><span class="cx" style="display: block; padding: 0 10px"> 'references' => 'o.references' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_sort = GP::$user->current()->get_meta('default_sort');
- if ( ! is_array($default_sort) ) {
- $default_sort = array(
- 'by' => 'priority',
- 'how' => 'desc'
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_sort = GP::$user->current()->sort_defaults();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sort_by = gp_array_get( $sort_bys, gp_array_get( $sort, 'by' ), gp_array_get( $sort_bys, $default_sort['by'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $sort_hows = array('asc' => 'ASC', 'desc' => 'DESC', );
</span></span></pre></div>
<a id="trunkgpincludesthingsuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/user.php 2015-07-24 17:46:47 UTC (rev 1101)
+++ trunk/gp-includes/things/user.php 2015-07-24 18:12:46 UTC (rev 1102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,6 +147,19 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function sort_defaults() {
+ $defaults = $this->get_meta('default_sort');
+
+ if ( ! is_array( $defaults ) ) {
+ $defaults = array(
+ 'by' => 'priority',
+ 'how' => 'desc'
+ );
+ }
+
+ return $defaults;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_avatar( $size = 100 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '//www.gravatar.com/avatar/' . md5( strtolower( $this->user_email ) ) . '?s=' . $size;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkgptemplatesprofilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/profile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/profile.php 2015-07-24 17:46:47 UTC (rev 1101)
+++ trunk/gp-templates/profile.php 2015-07-24 18:12:46 UTC (rev 1102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,13 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $per_page )
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = 15;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$default_sort = GP::$user->current()->get_meta('default_sort');
-if ( ! is_array($default_sort) ) {
- $default_sort = array(
- 'by' => 'priority',
- 'how' => 'desc'
- );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$default_sort = GP::$user->current()->sort_defaults();
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( "Profile" ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="" method="post">
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/translations.php 2015-07-24 17:46:47 UTC (rev 1101)
+++ trunk/gp-templates/translations.php 2015-07-24 18:12:46 UTC (rev 1102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,13 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <dt><?php _x('By:','sort by'); ?></dt>
</span><span class="cx" style="display: block; padding: 0 10px"> <dd>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_sort = GP::$user->current()->get_meta('default_sort');
- if ( ! is_array($default_sort) ) {
- $default_sort = array(
- 'by' => 'priority',
- 'how' => 'desc'
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_sort = GP::$user->current()->sort_defaults();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo gp_radio_buttons('sort[by]',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre>
</div>
</div>
</body>
</html>