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

Update favorite GET fallback to use new style of favorite

Browse Source
This commit is contained in:
Nathan Gray 2015-02-02 17:19:20 +00:00
parent ea60497448
commit 3ec43f0421
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -140,16 +140,21 @@ class etemplate_widget_nextmatch extends etemplate_widget
}
unset($send_value['col_filter']);
}
// Old type
if($favorite && $favorite['filter'])
{
$send_value = array_merge($value, $favorite['filter']);
$favorite['state'] = $favorite['filter'];
}
if($favorite && $favorite['state'])
{
$send_value = array_merge($value, $favorite['state']);
// Ajax call can handle the saved sort here, but this can't
if($favorite['filter']['sort'])
if($favorite['state']['sort'])
{
unset($send_value['sort']);
$send_value['order'] = $favorite['filter']['sort']['id'];
$send_value['sort'] = $favorite['filter']['sort']['asc'] ? 'ASC' : 'DESC';
$send_value['order'] = $favorite['state']['sort']['id'];
$send_value['sort'] = $favorite['state']['sort']['asc'] ? 'ASC' : 'DESC';
}
}
}