natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature.issue-due-date

Browse Source
This commit is contained in:
Simon Holywell
2012-05-02 12:21:44 +01:00
parent 6c130cd3ca b356625268
commit c0035061b0
14 changed files with 282 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/IDF/Project.php
View File

@@ -115,8 +115,7 @@ class IDF_Project extends Pluf_Model
array(
'join' => 'LEFT JOIN '.$activityTable.' ON current_activity='.$activityTable.'.id '
.'LEFT JOIN '.$tagTable.' ON idf_project_id='.$this->getSqlTable().'.id',
'select' => $this->getSelect().', date, value',
'group' => $this->getSqlTable().'.id',
'select' => 'DISTINCT '.$this->getSelect().', date, value',
'props' => array(
'date' => 'current_activity_date',
'value' => 'current_activity_value'