mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 17:04:14 +01:00
* Infolog - Add a preference to check 'Do not notify' by default for selected types
This commit is contained in:
parent
bf49f67782
commit
a0bcc5104b
@ -374,6 +374,15 @@ class infolog_hooks
|
|||||||
'admin' => False,
|
'admin' => False,
|
||||||
'default'=> '0', // No
|
'default'=> '0', // No
|
||||||
);
|
);
|
||||||
|
// Notify for types (default)
|
||||||
|
$settings['no_notification_types'] = array(
|
||||||
|
'type' => 'multiselect',
|
||||||
|
'label' => 'Do not notify',
|
||||||
|
'name' => 'no_notification_types',
|
||||||
|
'help' => "Automatically check 'Do not notify' for these types",
|
||||||
|
'values' => $info->enums['type'],
|
||||||
|
'default'=> array(), // None
|
||||||
|
);
|
||||||
|
|
||||||
$settings[] = array(
|
$settings[] = array(
|
||||||
'type' => 'section',
|
'type' => 'section',
|
||||||
|
@ -2206,6 +2206,15 @@ class infolog_ui
|
|||||||
$content['hours_per_workday'] = $this->hours_per_workday;
|
$content['hours_per_workday'] = $this->hours_per_workday;
|
||||||
if ($this->prefs['show_id']) $content['info_number'] = $info_id;
|
if ($this->prefs['show_id']) $content['info_number'] = $info_id;
|
||||||
|
|
||||||
|
// Check no notification preference, update if type changed
|
||||||
|
if($content['info_type'] != $content['old_type'])
|
||||||
|
{
|
||||||
|
$content['no_notifications'] = in_array($content['info_type'], !is_array($this->prefs['no_notification_types']) ?
|
||||||
|
explode(',',$this->prefs['no_notification_types']):
|
||||||
|
$this->prefs['no_notification_types']
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$content['info_anz_subs'] = (int)$content['info_anz_subs']; // gives javascript error if empty!
|
$content['info_anz_subs'] = (int)$content['info_anz_subs']; // gives javascript error if empty!
|
||||||
|
|
||||||
$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
|
$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
|
||||||
@ -2294,6 +2303,7 @@ class infolog_ui
|
|||||||
'referer' => $referer,
|
'referer' => $referer,
|
||||||
'no_popup' => $no_popup,
|
'no_popup' => $no_popup,
|
||||||
'old_pm_id' => $old_pm_id,
|
'old_pm_id' => $old_pm_id,
|
||||||
|
'old_type' => $content['info_type'],
|
||||||
));
|
));
|
||||||
$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserve,$no_popup ? 0 : 2);
|
$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserve,$no_popup ? 0 : 2);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user