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

Change how parent / child is handled:

Browse Source 
- No more preference or separate views
- Changing a sub-entry updates the modified date of the parent
This commit is contained in:
Nathan Gray 2014-08-25 23:43:32 +00:00
parent f3c15f87b1
commit 12ed9fe370
3 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infolog/inc/class.infolog_bo.inc.php
View File

@ -989,6 +989,13 @@ class infolog_bo
}
// merge changes (keeping extra values from the UI)
$values_in = array_merge($values_in,$values);
// Update modified timestamp of parent
if($values['info_id_parent'])
{
$parent = $this->read($values['info_id_parent'], false, 'server',true);
$this->write($parent,false, true, false, true);
}
}
return $info_id;
}

9
infolog/inc/class.infolog_hooks.inc.php
View File

@ -226,15 +226,6 @@ class infolog_hooks
'admin' => False,
'default'=> '1', // Yes
),
'listNoSubs' => array(
'type' => 'check',
'label' => 'List no Subs/Childs',
'name' => 'listNoSubs',
'help' => 'Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the Subs via there parent.',
'xmlrpc' => True,
'admin' => False,
'default'=> '0', // No = List subs
),
'show_links' => array(
'type' => 'select',
'label' => 'Show in the InfoLog list',

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

@ -1023,23 +1023,6 @@ class infolog_ui
'popup' => egw_link::get_registry('infolog', 'add_popup'),
'group' => $group=1,
),
'view' => array(
'caption' => 'View subs',
'icon' => 'egw_action/arrow_left',
'group' => $group,
'hint' => 'View all subs of this entry',
'enableClass' => 'infolog_rowHasSubs',
'enabled' => true,
),
'parent' => array(
'caption' => 'View parent',
'icon' => 'egw_action/arrow_up',
'group' => $group,
'hideOnDisabled' => true,
'hint' => 'View the parent of this entry and all his subs',
'enabled' => true,
'enableClass' => 'infolog_rowHasParent'
),
'add' => array(
'caption' => 'Add',
'group' => $group,
@ -1302,26 +1285,6 @@ class infolog_ui
$msg = $document_merge->download($settings, $checked, '', $this->prefs['document_dir']);
$failed = count($checked);
return false;
case 'parent':
$parent_query = array('col_filter' => array('info_id' => $checked));
$result = $this->bo->search($parent_query);
$parents = array();
foreach($result as $key => $info)
{
if(is_numeric($key))
{
$parents[] = $info['info_id_parent'];
}
}
$checked = array_unique($parents);
// Fall through
case 'view':
// remember filter to restore it, if infolog icon get's clicked next time
if ($query['filter']) egw_cache::setSession('infolog', 'filter_reset_from', $query['filter']);
$this->index(array(),'sp',$checked,0);
common::egw_exit();
case 'ical':
// infolog_ical lets horde be auto-loaded, so it must go first
$boical = new infolog_ical();