<!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>[BuddyPress][8167] trunk: Allow all notifications to be fetched by passing 'both' to is_new param of BP_Notifications_Notification::get()</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="http://buddypress.trac.wordpress.org/changeset/8167">8167</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-26 22:55:04 +0000 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow all notifications to be fetched by passing 'both' to is_new param of BP_Notifications_Notification::get()
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5315">#5315</a>
Props rodrigorznd</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpnotificationsbpnotificationsclassesphp">trunk/bp-notifications/bp-notifications-classes.php</a></li>
<li><a href="#trunkteststestcasesnotificationsclassbpnotificationsnotificationphp">trunk/tests/testcases/notifications/class-bp-notifications-notification.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpnotificationsbpnotificationsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-notifications/bp-notifications-classes.php (8166 => 8167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-notifications/bp-notifications-classes.php 2014-03-26 22:44:50 UTC (rev 8166)
+++ trunk/bp-notifications/bp-notifications-classes.php 2014-03-26 22:55:04 UTC (rev 8167)
</span><span class="lines">@@ -319,10 +319,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // is_new
</span><del>- if ( ! empty( $args['is_new'] ) ) {
- $where_conditions['is_new'] = "is_new = 1";
- } elseif ( isset( $args['is_new'] ) && ( 0 === $args['is_new'] || false === $args['is_new'] ) ) {
- $where_conditions['is_new'] = "is_new = 0";
</del><ins>+ if ( 'both' !== $args['is_new'] ) {
+ if ( ! empty( $args['is_new'] ) ) {
+ $where_conditions['is_new'] = "is_new = 1";
+ } elseif ( isset( $args['is_new'] ) && ( 0 === $args['is_new'] || false === $args['is_new'] ) ) {
+ $where_conditions['is_new'] = "is_new = 0";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // search_terms
</span><span class="lines">@@ -537,8 +539,9 @@
</span><span class="cx"> * filter by. Can be an array of component names.
</span><span class="cx"> * @type string|array $component_action Name of the action to
</span><span class="cx"> * filter by. Can be an array of actions.
</span><del>- * @type bool $is_new Whether to limit the query to is_new (unread)
- * notifications. Default: true.
</del><ins>+ * @type bool $is_new Whether to limit to new notifications. True
+ * returns only new notifications, false returns only non-new
+ * notifications. 'both' returns all. Default: true.
</ins><span class="cx"> * @type string $search_terms Term to match against component_name
</span><span class="cx"> * or component_action fields.
</span><span class="cx"> * @type string $order_by Field to order results by.
</span></span></pre></div>
<a id="trunkteststestcasesnotificationsclassbpnotificationsnotificationphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/notifications/class-bp-notifications-notification.php (8166 => 8167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/notifications/class-bp-notifications-notification.php 2014-03-26 22:44:50 UTC (rev 8166)
+++ trunk/tests/testcases/notifications/class-bp-notifications-notification.php 2014-03-26 22:55:04 UTC (rev 8167)
</span><span class="lines">@@ -150,4 +150,100 @@
</span><span class="cx"> $actual = wp_list_pluck( $n, 'id' );
</span><span class="cx"> $this->assertEquals( $expected, $actual );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group is_new
+ */
+ public function test_is_new_true() {
+ $u = $this->create_user();
+ $n1 = $this->factory->notification->create( array(
+ 'component_name' => 'friends',
+ 'user_id' => $u,
+ 'is_new' => false,
+ ) );
+ $n2 = $this->factory->notification->create( array(
+ 'component_name' => 'groups',
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+ $n3 = $this->factory->notification->create( array(
+ 'component_name' => 'messages',
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+
+ $n = BP_Notifications_Notification::get( array(
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+
+ // Check that the correct items are pulled up
+ $expected = array( $n2, $n3 );
+ $actual = wp_list_pluck( $n, 'id' );
+ $this->assertEquals( $expected, $actual );
+ }
+
+ /**
+ * @group is_new
+ */
+ public function test_is_new_false() {
+ $u = $this->create_user();
+ $n1 = $this->factory->notification->create( array(
+ 'component_name' => 'friends',
+ 'user_id' => $u,
+ 'is_new' => false,
+ ) );
+ $n2 = $this->factory->notification->create( array(
+ 'component_name' => 'groups',
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+ $n3 = $this->factory->notification->create( array(
+ 'component_name' => 'messages',
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+
+ $n = BP_Notifications_Notification::get( array(
+ 'user_id' => $u,
+ 'is_new' => false,
+ ) );
+
+ // Check that the correct items are pulled up
+ $expected = array( $n1 );
+ $actual = wp_list_pluck( $n, 'id' );
+ $this->assertEquals( $expected, $actual );
+ }
+
+ /**
+ * @group is_new
+ */
+ public function test_is_new_both() {
+ $u = $this->create_user();
+ $n1 = $this->factory->notification->create( array(
+ 'component_name' => 'friends',
+ 'user_id' => $u,
+ 'is_new' => false,
+ ) );
+ $n2 = $this->factory->notification->create( array(
+ 'component_name' => 'groups',
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+ $n3 = $this->factory->notification->create( array(
+ 'component_name' => 'messages',
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+
+ $n = BP_Notifications_Notification::get( array(
+ 'user_id' => $u,
+ 'is_new' => 'both',
+ ) );
+
+ // Check that the correct items are pulled up
+ $expected = array( $n1, $n2, $n3 );
+ $actual = wp_list_pluck( $n, 'id' );
+ $this->assertEquals( $expected, $actual );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>