Permalink
Browse files

preserve cols when joining with foreign tables

  • Loading branch information...
1 parent 4b35d49 commit 6d1b391adb3dee90cb11dc643cbcc1547031fbd8 @pschuele committed Mar 31, 2011
Showing with 4 additions and 8 deletions.
  1. +4 −8 tine20/Timetracker/Backend/Timesheet.php
@@ -7,7 +7,6 @@
* @license http://www.gnu.org/licenses/agpl.html AGPL Version 3
* @author Philipp Schüle <p.schuele@metaways.de>
* @copyright Copyright (c) 2007-2011 Metaways Infosystems GmbH (http://www.metaways.de)
- * @version $Id$
*/
/**
@@ -70,20 +69,17 @@ class Timetracker_Backend_Timesheet extends Tinebase_Backend_Sql_SearchImproved
'joinId' => 'timeaccount_id',
'select' => array('is_billable_combined' => '(timetracker_timesheet.is_billable*timetracker_timeaccount.is_billable)'),
'singleValue' => TRUE,
+ // needs to be preserved in select
+ 'preserve' => TRUE,
),
'is_cleared_combined' => array(
'table' => 'timetracker_timeaccount',
'joinOn' => 'id',
'joinId' => 'timeaccount_id',
'select' => array('is_cleared_combined' => "(timetracker_timesheet.is_cleared|(IF(STRCMP(timetracker_timeaccount.status, 'billed'),0,1)))"),
'singleValue' => TRUE,
- ),
- 'timetracker_timeaccount.is_billable' => array(
- 'table' => 'timetracker_timeaccount',
- 'joinOn' => 'id',
- 'joinId' => 'timeaccount_id',
- 'select' => array('timetracker_timeaccount.is_billable' => 'timetracker_timeaccount.is_billable'),
- 'singleValue' => TRUE,
+ // needs to be preserved in select
+ 'preserve' => TRUE,
),
);
}

0 comments on commit 6d1b391

Please sign in to comment.