extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* addressbook: current contact type is now used on creating new addressbook entrys (except a explizit type is requested via GET)

Browse Source
This commit is contained in:
Klaus Leithoff 2011-11-09 09:06:27 +00:00
parent 33a59d331d
commit 5c12f98c94
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -249,7 +249,9 @@ class addressbook_ui extends addressbook_bo
$content['nm']['search'] = $_GET['search']; $content['nm']['search'] = $_GET['search'];
} }
if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection; if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
// save the tid for use in creating new addressbook entrys via UI. Current tid is to be used as type of new entrys
//error_log(__METHOD__.__LINE__.' '.$content['nm']['col_filter']['tid']);
egw_cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']);
if ($this->lists_available()) if ($this->lists_available())
{ {
$sel_options['filter2'] = $this->get_lists(EGW_ACL_READ,array('' => lang('none'))); $sel_options['filter2'] = $this->get_lists(EGW_ACL_READ,array('' => lang('none')));
@ -1672,7 +1674,10 @@ class addressbook_ui extends addressbook_bo
} }
} }
$new_type = array_keys($this->content_types); $new_type = array_keys($this->content_types);
$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : $new_type[0]; // fetch active type to preset the type, if param typeid is not passed
$active_tid = egw_cache::getSession('addressbook','active_tid');
if ($active_tid && strtoupper($active_tid) === 'D') unset($active_tid);
$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
foreach($this->get_contact_columns() as $field) foreach($this->get_contact_columns() as $field)
{ {
if ($_GET['presets'][$field]) $content[$field] = $_GET['presets'][$field]; if ($_GET['presets'][$field]) $content[$field] = $_GET['presets'][$field];