extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-21 18:31:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add implicit preference to remember user's last sort order.

Browse Source 
Sort stored in favorites override this when the favorite is used.
This commit is contained in:
nathan 2023-04-14 10:28:16 -06:00
parent 80b99c67ec
commit dcf34dd74c
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -4347,6 +4347,10 @@ export class et2_nextmatch_sortheader extends et2_nextmatch_header implements et
{ {
// Send default sort mode if not sorted, otherwise send undefined to calculate // Send default sort mode if not sorted, otherwise send undefined to calculate
this.nextmatch.sortBy(this.id, this.sortmode == "none" ? !(this.options.sortmode.toUpperCase() == "DESC") : undefined); this.nextmatch.sortBy(this.id, this.sortmode == "none" ? !(this.options.sortmode.toUpperCase() == "DESC") : undefined);
// Update sort preference
this.egw().set_preference(this.nextmatch._get_appname(), this.nextmatch.options.template + "_sort", this.nextmatch.activeFilters["sort"]);
return true; return true;
} }

22
api/src/Etemplate/Widget/Nextmatch.php
View File

@ -120,7 +120,7 @@ class Nextmatch extends Etemplate\Widget
$value = self::get_array(self::$request->content, $form_name, true); $value = self::get_array(self::$request->content, $form_name, true);
$value['start'] = 0; $value['start'] = 0;
if(!array_key_exists('num_rows',$value)) if(!array_key_exists('num_rows', $value))
{ {
$value['num_rows'] = self::INITIAL_ROWS; $value['num_rows'] = self::INITIAL_ROWS;
} }
@ -129,24 +129,30 @@ class Nextmatch extends Etemplate\Widget
$send_value = $value; $send_value = $value;
list($app) = explode('.',$value['get_rows']); list($app) = explode('.', $value['get_rows']);
if (empty($GLOBALS['egw_info']['apps'][$app])) if(empty($GLOBALS['egw_info']['apps'][$app]))
{ {
list($app) = explode('.',$this->attrs['template']); list($app) = explode('.', $this->attrs['template']);
}
// Check for sort preference. We only apply this on first load so it can be changed
if($GLOBALS['egw_info']['user']['preferences'][$app][$this->attrs['template'] . "_sort"])
{
$send_value['sort'] = $GLOBALS['egw_info']['user']['preferences'][$app][$this->attrs['template'] . "_sort"];
} }
// Check for a favorite in URL // Check for a favorite in URL
if (!empty($_GET['favorite']) && !empty($value['favorites'])) if(!empty($_GET['favorite']) && !empty($value['favorites']))
{ {
$safe_name = preg_replace('/[^A-Za-z0-9-_]/','_',strip_tags($_GET['favorite'])); $safe_name = preg_replace('/[^A-Za-z0-9-_]/', '_', strip_tags($_GET['favorite']));
$pref_name = "favorite_" .$safe_name; $pref_name = "favorite_" . $safe_name;
// Do some easy applying of filters server side // Do some easy applying of filters server side
$favorite = $GLOBALS['egw_info']['user']['preferences'][$app][$pref_name]; $favorite = $GLOBALS['egw_info']['user']['preferences'][$app][$pref_name];
if(!$favorite && $_GET['favorite'] == 'blank') if(!$favorite && $_GET['favorite'] == 'blank')
{ {
// Have to go through each of these // Have to go through each of these
foreach(array('search','cat_id','filter','filter2') as $filter) foreach(array('search', 'cat_id', 'filter', 'filter2') as $filter)
{ {
$send_value[$filter] = ''; $send_value[$filter] = '';
} }