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

make sure the default type for addressbook is found if there is no entry in egw_config

Browse Source
This commit is contained in:
Klaus Leithoff 2010-02-10 14:27:14 +00:00
parent ed7f3a764e
commit e763d692c9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addressbook/inc/class.addressbook_hooks.inc.php
View File

@ -320,6 +320,7 @@ class addressbook_hooks
'add_id' => 'link_id', 'add_id' => 'link_id',
'add_popup' => '850x440', 'add_popup' => '850x440',
'file_access'=> 'addressbook.addressbook_bo.file_access', 'file_access'=> 'addressbook.addressbook_bo.file_access',
'default_types' => array('n' => array('name' => 'contact', 'options' => array('icon' => 'navbar.png','template' => 'addressbook.edit'))),
); );
} }

13
admin/inc/class.customfields.inc.php
View File

@ -79,13 +79,21 @@ class customfields
$this->fields = config::get_customfields($this->appname,true); $this->fields = config::get_customfields($this->appname,true);
$this->tmpl->read('admin.customfields'); $this->tmpl->read('admin.customfields');
if($this->manage_content_types) $this->content_types = $this->get_content_types(); if($this->manage_content_types)
{
$this->content_types = config::get_content_types($this->appname);
if (count($this->content_types)==0)
{
// if you define your default types of your app with the search_link hook, they are available here, if no types were found
$this->content_types = (array)egw_link::get_registry($this->appname,'default_types');
//error_log( array2string($this->content_types));
}
}
else else
{ {
$this->tmpl->children[0]['data'][2]['A']['disabled'] = true; $this->tmpl->children[0]['data'][2]['A']['disabled'] = true;
$this->tmpl->children[0]['data'][3]['A']['disabled'] = true; $this->tmpl->children[0]['data'][3]['A']['disabled'] = true;
} }
if (is_array($content)) if (is_array($content))
{ {
//echo '<pre style="text-align: left;">'; print_r($content); echo "</pre>\n"; //echo '<pre style="text-align: left;">'; print_r($content); echo "</pre>\n";
@ -153,7 +161,6 @@ class customfields
$content['content_types']['non_deletable'] = true; $content['content_types']['non_deletable'] = true;
} }
} }
//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n"; //echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
$content['fields'] = array('use_private' => $content['use_private']); $content['fields'] = array('use_private' => $content['use_private']);
$n = 0; $n = 0;