extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not set correctly timesheet title by using project name as title

Browse Source
This commit is contained in:
Hadi Nategh 2013-08-22 13:52:18 +00:00
parent 0c9c6b6afd
commit 5fcedd5ad7
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -391,16 +391,10 @@ class timesheet_ui extends timesheet_bo
), ),
); );
$sel_options['status'] = $this->field2label; $sel_options['status'] = $this->field2label;
if (empty($content['ts_title']))
{
$content['ts_title'] = $content['ts_title_blur'] = ($preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur']);
}
// the actual title-blur is either the preserved title blur (if we are called from infolog entry), // the actual title-blur is either the preserved title blur (if we are called from infolog entry),
// or the preserved project-blur comming from the current selected project // or the preserved project-blur comming from the current selected project
$content['ts_title_blur'] = $preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur']; $content['ts_title_blur'] = $preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur'];
// make sure that ts_title is shown (if set), by unsetting the blur text
if (!empty($content['ts_title']) && $content['ts_title']==$content['ts_title_blur']) unset($content['ts_title_blur']);
$readonlys = array( $readonlys = array(
'button[delete]' => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE), 'button[delete]' => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),
'button[edit]' => !$view || !$this->check_acl(EGW_ACL_EDIT), 'button[edit]' => !$view || !$this->check_acl(EGW_ACL_EDIT),

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

@ -12,7 +12,7 @@
<rows> <rows>
<row class="row" disabled="@ts_viewtype"> <row class="row" disabled="@ts_viewtype">
<description value="Title" options=",,,ts_title"/> <description value="Title" options=",,,ts_title"/>
<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" span="all" class="fullWidth" tabindex="1"/> <textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" span="all" class="fullWidth"/>
<description/> <description/>
<description/> <description/>
</row> </row>
@ -187,7 +187,7 @@
</hbox> </hbox>
</row> </row>
<row> <row>
<hbox orient="0" span="2"> <hbox span="2">
<hbox> <hbox>
<button statustext="Edit this entry" label="Edit" id="button[edit]"/> <button statustext="Edit this entry" label="Edit" id="button[edit]"/>
<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]"/> <button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]"/>