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

Change pm_id filter to link-entry to match edit dialog.

Browse Source 
Fixes empty pm_id filter when PM integration = full
This commit is contained in:
Nathan Gray 2014-07-08 22:06:04 +00:00
parent 57bd7c7a9b
commit c11785b2db
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,6 +874,7 @@ class timesheet_ui extends timesheet_bo
'row_modified' => 'ts_modified', 'row_modified' => 'ts_modified',
//'actions' => $this->get_actions(), //'actions' => $this->get_actions(),
'default_cols' => '!legacy_actions', // switch legacy actions column and row off by default 'default_cols' => '!legacy_actions', // switch legacy actions column and row off by default
'pm_integration' => $this->pm_integration,
); );
} }
$content['nm']['actions'] = $this->get_actions($content['nm']); $content['nm']['actions'] = $this->get_actions($content['nm']);

8
timesheet/templates/default/index.xet
View File

@ -2,7 +2,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="timesheet.index.dates" template="" lang="" group="0" version="1.2.001" > <template id="timesheet.index.dates" template="" lang="" group="0" version="1.2.001" >
<hbox cols="1" rows="1" > <hbox>
<description value="Start"/> <description value="Start"/>
<date id="startdate"/> <date id="startdate"/>
<description value="End"/> <description value="End"/>
@ -38,7 +38,7 @@
<nextmatch-filterheader id="ts_project" no_lang="1" options="All projects" search="false"/> <nextmatch-filterheader id="ts_project" no_lang="1" options="All projects" search="false"/>
</row> </row>
<row disabled="!@pm_integration=full"> <row disabled="!@pm_integration=full">
<nextmatch-customfilter id="pm_id" options="projectmanager-select,All projects"/> <nextmatch-entryheader id="pm_id" no_lang="1" blur="All projects" only_app="projectmanager"/>
</row> </row>
<row> <row>
<nextmatch-customfilter id="linked" options="link-entry"/> <nextmatch-customfilter id="linked" options="link-entry"/>
@ -53,7 +53,7 @@
<nextmatch-sortheader label="Duration" id="ts_duration"/> <nextmatch-sortheader label="Duration" id="ts_duration"/>
<date-duration id="duration" readonly="true" options=",h,,,1"/> <date-duration id="duration" readonly="true" options=",h,,,1"/>
</vbox> </vbox>
<vbox options="0,0"> <vbox>
<nextmatch-sortheader label="Quantity" id="ts_quantity"/> <nextmatch-sortheader label="Quantity" id="ts_quantity"/>
<textbox type="float" id="quantity" readonly="true" precision="3"/> <textbox type="float" id="quantity" readonly="true" precision="3"/>
</vbox> </vbox>
@ -68,7 +68,7 @@
</row> </row>
<row class="$row_cont[cat_id] $row_cont[class]"> <row class="$row_cont[cat_id] $row_cont[class]">
<date-time id="${row}[ts_start]" readonly="true" options=",8"/> <date-time id="${row}[ts_start]" readonly="true" options=",8"/>
<vbox options="0,0"> <vbox>
<link id="${row}[ts_link]" no_lang="1"/> <link id="${row}[ts_link]" no_lang="1"/>
<description id="${row}[ts_title]" no_lang="1" class="ts_title $row_cont[titleClass]"/> <description id="${row}[ts_title]" no_lang="1" class="ts_title $row_cont[titleClass]"/>
<description id="${row}[ts_description]" class="ts_description" no_lang="1"/> <description id="${row}[ts_description]" class="ts_description" no_lang="1"/>