holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix addressbook CRM next/previous buttons don't update nextmatch

Browse Source
This commit is contained in:
Nathan Gray 2014-08-05 23:27:06 +00:00
parent 98cd4bbe28
commit 70d85ca78f
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -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;

8
addressbook/js/app.js
View File

@ -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);
}
},