[Fmsystem-commits] [10100] Logistic: Added description field

[Torstein]

Revision: 10100
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10100
Author:   vator
Date:     2012-10-03 08:48:56 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
Logistic: Added description field

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

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-10-03 08:05:55 UTC (rev 
10099)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-03 08:48:56 UTC (rev 
10100)
@@ -42,7 +42,8 @@
                        'add'   => true,
                        'edit' => true,
                        'view' => true,
-                       'index' => true
+                       'index' => true,
+                       'test' => true
                );
 
                public function __construct()
@@ -53,7 +54,7 @@
                        $this->so_project = createObject('logistic.soproject');
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"logistic::project::activity";
                }
-
+               
                public function index()
                {
                        if (phpgw::get_var('phpgw_return_as') == 'json')
@@ -340,6 +341,7 @@
                                $activity->set_name( phpgw::get_var('name') );
                                $activity->set_update_user( $user_id );
                                $activity->set_responsible_user_id( 
phpgw::get_var('responsible_user_id') );
+                               $activity->set_description( 
phpgw::get_var('description') );
 
                                if(phpgw::get_var('start_date','string') != '')
                                {

Modified: trunk/logistic/inc/model/class.activity.inc.php
===================================================================
--- trunk/logistic/inc/model/class.activity.inc.php     2012-10-03 08:05:55 UTC 
(rev 10099)
+++ trunk/logistic/inc/model/class.activity.inc.php     2012-10-03 08:48:56 UTC 
(rev 10100)
@@ -209,7 +209,12 @@
                                        
                                        foreach($this->sub_activities as 
$activitiy)
                                        {
-                                               
$converted_obj_array['sub_activities'][] = $activitiy->toArray();
+                                               // Checks if object to be 
converted is not the same as this object, 
+                                               // otherwise an eternal loop 
will happen
+                                               if($activitiy != $this)
+                                               {
+                                                       
$converted_obj_array['sub_activities'][] = $activitiy->toArray();
+                                               }
                                        }
                                                                
                                        return $converted_obj_array;