[Fmsystem-commits] [10086]

[Torstein]

Revision: 10086
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10086
Author:   vator
Date:     2012-10-02 08:40:35 +0000 (Tue, 02 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-02 08:40:25 UTC (rev 
10085)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-02 08:40:35 UTC (rev 
10086)
@@ -362,17 +362,26 @@
                        }
                        else
                        {
-
                                $accounts = 
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
 
-
+                               $parent_activity_id = 
phpgw::get_var('parent_id');
+                               $activity->set_parent_id($parent_activity_id);
+                         $parent_activity = 
$this->so->get_single($parent_activity_id);
+                                                       
+                         $activities = $this->so->get_activities();
+                               
                                $data = array
-                                       (
-                                       'user_array' => $accounts,
+                               (
+                                       'responsible_users' => $accounts,
+                                       'activities' => $activities,
                                        'activity' => $activity->toArray(),
-                                       'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                        'editable' => true,
                                );
+                               
+                               if($parent_activity > 0)
+                               {
+                                       $data['parent_activity'] = 
$parent_activity->toArray();
+                               }
 
                                $this->use_yui_editor('description');
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Add activity');
@@ -384,7 +393,6 @@
                        }
                }
 
-
                public function view()
                {
                        $activity_id = phpgw::get_var('id');