[Fmsystem-commits] [10486]

[Torstein]

Revision: 10486
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10486
Author:   vator
Date:     2012-11-06 12:29:16 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------


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

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-11-06 12:24:24 UTC 
(rev 10485)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-11-06 12:29:16 UTC 
(rev 10486)
@@ -460,6 +460,7 @@
                                $db_requirement->transaction_begin();
                                $requirement_id = 
$this->so->store($requirement);
                                
+                               $status_delete_values = true;
                                if( ($old_location_id > 0) && 
(is_numeric($old_location_id) ) && ($old_location_id != $new_location_id) )
                                {
                                        $status_delete_values = 
$this->so_requirement_value->delete_values( $requirement_id );
@@ -664,11 +665,14 @@
 
                        $tabs = $this->make_tab_menu($requirement_id);
 
+                       $activity = $this->so_activity->get_single( 
$requirement->get_activity_id() ); 
+                       
                        $data = array
                        (
                                'tabs'                                          
                                                        => 
$GLOBALS['phpgw']->common->create_tabs($tabs, 1),
                                'view'                                          
                                                        => "requirement_values",
                                'requirement'                                   
                                => $requirement,
+                               'activity'                                      
                                                => $activity,
                                'requirement_attributes_array'  => 
$requirement_attributes_array
                        );