[Fmsystem-commits] [10233]

[Torstein]

Revision: 10233
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10233
Author:   vator
Date:     2012-10-16 09:12:52 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-10-16 09:12:15 UTC (rev 
10232)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-16 09:12:52 UTC (rev 
10233)
@@ -445,7 +445,7 @@
                                }
 
                                $activity->set_project_id($project_id);
-
+                               
                                $data = array
                                        (
                                                'activity' => 
$activity->toArray(),
@@ -453,6 +453,12 @@
                                                'dateformat'                    
        => $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
                                );
 
+                               if($activity->get_parent_id() > 0)
+                               {
+                                       $parent_activity = 
$this->so->get_single($activity->get_parent_id());
+                                       $data['parent_activity'] = 
$parent_activity->toArray();
+                               }
+                               
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Project');
                                
self::render_template_xsl(array('activity_item'), $data);
                        }