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

"fix for bug #1467: sorting get lost using green close icon"

Browse Source
This commit is contained in:
Ralf Becker 2008-10-22 06:51:01 +00:00
parent 2d7f22e7ec
commit 1d549d1dcc
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
infolog/inc/class.infolog_ui.inc.php
View File

@ -294,7 +294,7 @@ class infolog_ui
*/ */
function get_rows(&$query,&$rows,&$readonlys) function get_rows(&$query,&$rows,&$readonlys)
{ {
//echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).")</p>\n"; //echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n";
if (!isset($query['start'])) $query['start'] = 0; if (!isset($query['start'])) $query['start'] = 0;
if (!$query['csv_export']) if (!$query['csv_export'])
@ -486,7 +486,7 @@ class infolog_ui
unset($session); unset($session);
} }
} }
//echo "<p align=right>infolog_ui::index(action='$action/$action_id',called_as='$called_as/$values[referer]',own_referer='$own_referer') values=\n"; _debug_array($values); //echo "<p>".__METHOD__."(action='$action/$action_id',called_as='$called_as/$values[referer]',own_referer='$own_referer') values=\n"; _debug_array($values);
if (!is_array($values)) if (!is_array($values))
{ {
$values = array('nm' => $this->read_sessiondata()); $values = array('nm' => $this->read_sessiondata());
@ -624,7 +624,10 @@ class infolog_ui
$persist['called_as'] = $called_as; $persist['called_as'] = $called_as;
$persist['own_referer'] = $own_referer; $persist['own_referer'] = $own_referer;
$values['nm']['csv_fields'] = true; // get set in get_rows to not include all custom fields $values['nm']['csv_fields'] = true; // get set in get_rows to not include all custom fields
$persist['nm'] = array(
'sort' => $values['nm']['sort'],
'order' => $values['nm']['order'],
);
if (!$called_as) if (!$called_as)
{ {
$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologIndex'); $GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologIndex');
@ -638,8 +641,15 @@ class infolog_ui
),$readonlys,$persist,$return_html ? -1 : 0); ),$readonlys,$persist,$return_html ? -1 : 0);
} }
/**
* Closes an infolog
*
* @param int|array $values=0 info_id (default _GET[info_id])
* @param string $referer=''
*/
function close($values=0,$referer='') function close($values=0,$referer='')
{ {
//echo "<p>".__METHOD__."($values,$referer)</p>\n";
$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id'])); $info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
$referer = is_array($values) ? $values['referer'] : $referer; $referer = is_array($values) ? $values['referer'] : $referer;
@ -665,6 +675,13 @@ class infolog_ui
if ($referer) $this->tmpl->location($referer); if ($referer) $this->tmpl->location($referer);
} }
/**
* Deletes an InfoLog entry
*
* @param array|int $values=0 info_id (default _GET[info_id])
* @param string $referer=''
* @param string $called_by=''
*/
function delete($values=0,$referer='',$called_by='') function delete($values=0,$referer='',$called_by='')
{ {
$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id'])); $info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));