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

use implicit nameing after type for custom templates "addressbook.edit.$type" like in InfoLog

Browse Source
This commit is contained in:
Ralf Becker 2014-10-09 12:03:40 +00:00
parent 28afa0994b
commit 9ba78cfd69
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2144,12 +2144,9 @@ window.egw_LAB.wait(function() {
if ($content['private']) $content['owner'] .= 'p';
//$GLOBALS['egw_info']['flags']['include_xajax'] = true;
if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template'] ? $this->content_types[$content['tid']]['options']['template'] : 'addressbook.edit'))
// for custom types, check if we have a custom edit template named "addressbook.edit.$type", $type is the name
if (in_array($content['tid'], array('n',self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
{
$content['msg'] = lang('WARNING: Template "%1" not found, using default template instead.', $this->content_types[$content['tid']]['options']['template'])."\n";
$content['msg'] .= lang('Please update the templatename in your customfields section!');
$this->tmpl->read('addressbook.edit');
}

2
addressbook/lang/egw_en.lang
View File

@ -368,7 +368,6 @@ phone numbers common en Phone numbers
photo addressbook en Photo
please enter a name for that field ! addressbook en Enter a name to that field!
please select only one category addressbook en Select only one category
please update the templatename in your customfields section! addressbook en Update the template name in custom fields section!
postal common en Postal
pref addressbook en Pref
preferred email address to use in distribution lists addressbook en Preferred email address
@ -484,7 +483,6 @@ verification addressbook en Verification
view linked infolog entries addressbook en View linked InfoLog entries
warning!! ldap is valid only if you are not using contacts for accounts storage! admin en WARNING!! LDAP is valid only if you are NOT using contacts for accounts storage!
warning: all contacts found will be deleted! addressbook en WARNING: All contacts found will be deleted!
warning: template "%1" not found, using default template instead. addressbook en WARNING: Template "%1" not found, using default template instead.
weekday addressbook en Weekday
what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook en Address book links displayed in other applications. Empty values will be left out. You need to log in anew, if you change this setting!
when viewing a contact, show linked entries from the selected application addressbook en When viewing a contact, show linked entries from the selected application