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

"two fixes for the num_rows in the next-match widget:

Browse Source 
- use a default of 15 rows, if user&group has no pref set
- use what's stored in the extension data, if value not set (nm-header not shown)"
This commit is contained in:
Ralf Becker 2007-06-08 08:51:05 +00:00
parent 9e6050bc22
commit af5804129f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -209,7 +209,7 @@
} }
if (!isset($value['cat_app'])) $value['cat_app'] = $app; // if no cat_app set, use the app from the get_rows func if (!isset($value['cat_app'])) $value['cat_app'] = $app; // if no cat_app set, use the app from the get_rows func
$max = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; if (!($max = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $max = 15;
$row_options = array(); $row_options = array();
foreach(array(5,12,25,50,100,200,500,999) as $n) foreach(array(5,12,25,50,100,200,500,999) as $n)
{ {
@ -593,10 +593,10 @@
{ {
$loop = true; // num_rows changed $loop = true; // num_rows changed
} }
$value['num_rows'] = (int) $value['num_rows']; // num_rows: use old value in extension data, if $value['num_rows'] is not set because nm-header is not shown
$value['num_rows'] = isset($value['num_rows']) ? (int) $value['num_rows'] : (int) $extension_data['num_rows'];
$max = $value['num_rows'] ? $value['num_rows'] : (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $max = $value['num_rows'] ? $value['num_rows'] : (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
if(strpos($value['search'],'xjxquery')) { if(strpos($value['search'],'xjxquery')) {
// We deal with advancedsearch // We deal with advancedsearch
$aXml = $value['search']; $aXml = $value['search'];