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

* InfoLog: explicitly name tabs in infolog.edit, to get disabeling of tabs working, even if template added custom ones

Browse Source
This commit is contained in:
Ralf Becker 2012-05-08 09:58:45 +00:00
parent c939232fee
commit 34edd70a5f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1531,7 +1531,6 @@ else
*/
function edit($content = null,$action = '',$action_id=0,$type='',$referer='')
{
$tabs = 'description|links|delegation|project|customfields|history';
if (($submit = is_array($content)))
{
//echo "infolog_ui::edit: content="; _debug_array($content);
@ -1594,7 +1593,7 @@ else
{
$content['info_link_id'] = 0; // as field has to be int
}
$active_tab = $content[$tabs];
$active_tab = $content['tabs'];
if (!($info_id = $this->bo->write($content, true, true, true, $content['no_notifications'])))
{
$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') :
@ -1614,7 +1613,7 @@ else
$content['msg'] = lang('InfoLog entry saved');
$content['js'] = "opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','infolog',$info_id,'$operation');";
}
$content[$tabs] = $active_tab;
$content['tabs'] = $active_tab;
if ((int) $content['pm_id'] != (int) $content['old_pm_id'])
{
//echo "<p>pm_id changed: $content[old_pm_id] -> $content[pm_id]</p>\n";
@ -1951,13 +1950,13 @@ else
}
else
{
$readonlys[$tabs]['customfields'] = true;
$readonlys['tabs']['customfields'] = true;
}
if (!isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
{
$readonlys[$tabs]['project'] = true; // disable the project tab
$readonlys['tabs']['project'] = true; // disable the project tab
}
$readonlys[$tabs]['delegation'] = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
$readonlys['tabs']['delegation'] = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
!isset($GLOBALS['egw_info']['user']['apps']['admin']);
$content['duration_format'] = $this->duration_format;
@ -2004,7 +2003,7 @@ else
}
else
{
$readonlys[$tabs]['history'] = true;
$readonlys['tabs']['history'] = true;
}
$sel_options = array(
'info_type' => $types,

4
infolog/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

4
infolog/templates/default/edit.xet
View File

@ -160,7 +160,7 @@
</rows>
</grid>
</template>
<template id="infolog.edit" template="" lang="" group="0" version="1.9.002">
<template id="infolog.edit" template="" lang="" group="0" version="1.9.003">
<grid width="100%">
<columns>
<column width="103"/>
@ -211,7 +211,7 @@
<textbox statustext="a short subject for the entry" id="info_subject" size="80" maxlength="255" span="all"/>
</row>
<row valign="top" height="250">
<tabbox id="description|links|delegation|project|customfields|history" span="all">
<tabbox id="tabs" span="all">
<tabs>
<tab id="description" label="Description" statustext="longer textual description"/>
<tab id="links" label="Links" statustext="Links of this entry"/>