forked from extern/egroupware
fix for timesheet edit tabs problem; tabs showed, even if set to readonly;
This commit is contained in:
Klaus Leithoff
parent
217f0de233
commit
d9531fb421
@ -58,7 +58,6 @@ class timesheet_ui extends timesheet_bo
|
||||
|
||||
function edit($content = null,$view = false)
|
||||
{
|
||||
$tabs = 'general|notes|links|customfields|history';
|
||||
$etpl = new etemplate('timesheet.edit');
|
||||
if (!is_array($content))
|
||||
{
|
||||
@ -118,7 +117,7 @@ class timesheet_ui extends timesheet_bo
|
||||
$view = $content['view'];
|
||||
$referer = $content['referer'];
|
||||
$this->data = $content;
|
||||
foreach(array('button','view','referer',$tabs,'start_time') as $key)
|
||||
foreach(array('button','view','referer','tabs','start_time') as $key)
|
||||
{
|
||||
unset($this->data[$key]);
|
||||
}
|
||||
@ -246,7 +245,7 @@ class timesheet_ui extends timesheet_bo
|
||||
$content = array_merge($this->data,array(
|
||||
'msg' => $msg,
|
||||
'view' => $view,
|
||||
$tabs => $content[$tabs],
|
||||
'tabs' => $content['tabs'],
|
||||
'link_to' => array(
|
||||
'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
|
||||
'to_app' => TIMESHEET_APP,
|
||||
@ -356,10 +355,10 @@ class timesheet_ui extends timesheet_bo
|
||||
|
||||
if($this->ts_viewtype == 'short')
|
||||
{
|
||||
$content['ts_viewtype'] = $readonlys[$tabs]['notes'] = true;
|
||||
$content['ts_viewtype'] = $readonlys['tabs']['notes'] = true;
|
||||
}
|
||||
if (!$this->customfields) $readonlys[$tabs]['customfields'] = true; // suppress tab if there are not customfields
|
||||
if (!$this->data['ts_id']) $readonlys[$tabs]['history'] = true; //suppress history for the first loading without ID
|
||||
if (!$this->customfields) $readonlys['tabs']['customfields'] = true; // suppress tab if there are not customfields
|
||||
if (!$this->data['ts_id']) $readonlys['tabs']['history'] = true; //suppress history for the first loading without ID
|
||||
|
||||
return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/**
|
||||
* eGroupWare - eTemplates for Application timesheet
|
||||
* http://www.egroupware.org
|
||||
* generated by soetemplate::dump4setup() 2009-09-10 10:18
|
||||
* generated by soetemplate::dump4setup() 2009-09-24 14:25
|
||||
*
|
||||
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
||||
* @package timesheet
|
||||
@ -73,6 +73,10 @@ $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','
|
||||
.fullWidth input { widht: 100%; }
|
||||
.fullWidth textarea { widht: 100%; }','modified' => '1237891824',);
|
||||
|
||||
$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:41:"General|Notes|Links|Custom Fields|History";s:4:"name";s:45:"tabs=general|notes|links|customfields|history";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
|
||||
.fullWidth input { widht: 100%; }
|
||||
.fullWidth textarea { widht: 100%; }','modified' => '1253795098',);
|
||||
|
||||
$templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1163173930',);
|
||||
|
||||
$templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1163173930',);
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<!-- $Id$ -->
|
||||
<overlay>
|
||||
<template id="timesheet.edit.general" template="" lang="" group="0" version="1.7.001">
|
||||
<grid width="100%" height="150">
|
||||
<grid width="100%" height="250" overflow="auto">
|
||||
<columns>
|
||||
<column width="95"/>
|
||||
<column width="120"/>
|
||||
@ -56,7 +56,7 @@
|
||||
</grid>
|
||||
</template>
|
||||
<template id="timesheet.edit.notes" template="" lang="" group="0" version="1.5.001">
|
||||
<grid width="100%" height="150">
|
||||
<grid width="100%" height="450" overflow="auto">
|
||||
<columns>
|
||||
<column/>
|
||||
</columns>
|
||||
@ -68,7 +68,7 @@
|
||||
</grid>
|
||||
</template>
|
||||
<template id="timesheet.edit.links" template="" lang="" group="0" version="0.1.001">
|
||||
<grid width="100%" height="150" overflow="auto">
|
||||
<grid width="100%" height="150">
|
||||
<columns>
|
||||
<column width="100"/>
|
||||
<column/>
|
||||
@ -90,7 +90,7 @@
|
||||
</grid>
|
||||
</template>
|
||||
<template id="timesheet.edit.customfields" template="" lang="" group="0" version="1.5.001">
|
||||
<grid width="100%" height="150" overflow="auto">
|
||||
<grid width="100%" height="150">
|
||||
<columns>
|
||||
<column/>
|
||||
</columns>
|
||||
@ -102,7 +102,7 @@
|
||||
</grid>
|
||||
</template>
|
||||
<template id="timesheet.edit.history" template="" lang="" group="0" version="1.7.001">
|
||||
<grid width="100%" height="250" overflow="auto">
|
||||
<grid width="100%" height="150" overflow="auto">
|
||||
<columns>
|
||||
<column/>
|
||||
</columns>
|
||||
@ -113,7 +113,7 @@
|
||||
</rows>
|
||||
</grid>
|
||||
</template>
|
||||
<template id="timesheet.edit" template="" lang="" group="0" version="1.7.002">
|
||||
<template id="timesheet.edit" template="" lang="" group="0" version="1.7.003">
|
||||
<grid width="100%">
|
||||
<columns>
|
||||
<column width="100"/>
|
||||
@ -162,7 +162,7 @@
|
||||
</grid>
|
||||
</row>
|
||||
<row>
|
||||
<tabbox id="general|notes|links|customfields|history" span="all">
|
||||
<tabbox id="tabs" span="all">
|
||||
<tabs>
|
||||
<tab label="General" statustext=""/>
|
||||
<tab label="Notes" statustext=""/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user