extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix $action gets lost if an action (delete) is done

Browse Source 
- Fix deleted filter + link showed no results
This commit is contained in:
Nathan Gray 2014-04-28 20:25:40 +00:00
parent 1aee6f3bed
commit 354a8426af
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infolog/inc/class.infolog_so.inc.php
View File

@ -692,7 +692,7 @@ class infolog_so
if ($action) if ($action)
{ {
$links = solink::get_links($action=='sp'?'infolog':$action, $links = solink::get_links($action=='sp'?'infolog':$action,
is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog'); is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog','',$query['col_filter']['info_status'] =='deleted');
if (count($links)) if (count($links))
{ {

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

@ -318,7 +318,7 @@ class infolog_ui
$id = $link['id']; $id = $link['id'];
} }
if(!is_array($id)) $id = explode(',',$id); if(!is_array($id)) $id = explode(',',$id);
if (!($linked = egw_link::get_links_multiple($app,$id,true,'infolog'))) if (!($linked = egw_link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
{ {
$rows = array(); // no infologs linked to selected link --> no rows to return $rows = array(); // no infologs linked to selected link --> no rows to return
return 0; return 0;
@ -780,7 +780,7 @@ class infolog_ui
} }
unset($values['nm']['rows']['checked']); // not longer used, but hides button actions unset($values['nm']['rows']['checked']); // not longer used, but hides button actions
if ($values['add'] || $values['cancel'] || isset($values['nm']['rows']) || isset($values['main'])) if ($values['add'] || $values['cancel'] || isset($values['main']))
{ {
if ($values['add']) if ($values['add'])
{ {
@ -796,7 +796,7 @@ class infolog_ui
} }
else else
{ {
list($do,$do2) = isset($values['main']) ? each($values['main']) : @each($values['nm']['rows']); list($do,$do2) = each($values['main']);
list($do_id) = @each($do2); list($do_id) = @each($do2);
switch((string)$do) switch((string)$do)
{ {

2
infolog/js/app.js
View File

@ -178,7 +178,7 @@ app.classes.infolog = AppJS.extend(
{ {
for(var i = 0; i < _senders.length; i++) for(var i = 0; i < _senders.length; i++)
{ {
if ($j(_senders[i].iface.node).hasClass('infolog_rowHasSubs')) if ($j(_senders[i].iface.getDOMNode()).hasClass('infolog_rowHasSubs'))
{ {
children = true; children = true;
break; break;