From 70d85ca78fde30daaf1831aa07a7577f8043346d Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 5 Aug 2014 23:27:06 +0000
Subject: [PATCH] Fix addressbook CRM next/previous buttons don't update
 nextmatch

---
 addressbook/inc/class.addressbook_ui.inc.php | 4 ++--
 addressbook/js/app.js                        | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 7da613345c..d689bb5332 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2366,7 +2366,7 @@ window.egw_LAB.wait(function() {
 							case 'infolog':
 							case 'tracker':
 							default:
-								egw_json_response::get()->apply('app.addressbook.view_set_list',Array('linked',$contact_id));
+								egw_json_response::get()->apply('app.addressbook.view_set_list',Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
 								break;
 						}
 
@@ -2387,7 +2387,6 @@ window.egw_LAB.wait(function() {
 					'ajax' => 'true'
 				));
 			}
-			$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 			if (isset($_GET['index']))
 			{
 				$content['index'] = (int)$_GET['index'];
@@ -2399,6 +2398,7 @@ window.egw_LAB.wait(function() {
 				$num_rows = $this->get_rows($query, $rows, $readonlys, true);
 			}
 		}
+		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 
 		// make everything not explicit mentioned readonly
 		$readonlys['__ALL__'] = true;
diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index 9131188aae..cab4855dda 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -104,10 +104,9 @@ app.classes.addressbook = AppJS.extend(
 	/**
 	 * Set link filter for the already open & rendered  list
 	 *
-	 * @param {string} col_filter_name Name of the column filter to set
-	 * @param {string} contact_id New contact ID
+	 * @param {Object} filter Object with key / value pairs of filters to set
 	 */
-	view_set_list: function(col_filter_name, contact_id)
+	view_set_list: function(filter)
 	{
 		// Find the infolog list
 		var list = etemplate2.getById(
@@ -116,9 +115,6 @@ app.classes.addressbook = AppJS.extend(
 		var nm = list ? list.widgetContainer.getWidgetById('nm') : null;
 		if(nm)
 		{
-			// Update the link filter to new contact
-			var filter = {col_filter:{}};
-			filter.col_filter[col_filter_name] = 'addressbook:'+contact_id;
 			nm.applyFilters(filter);
 		}
 	},