[Fmsystem-commits] [10149] Logistic: Some changes to edit

[Torstein]

Revision: 10149
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10149
Author:   vator
Date:     2012-10-08 12:03:59 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Logistic: Some changes to edit

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-10-08 12:03:19 UTC 
(rev 10148)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-10-08 12:03:59 UTC 
(rev 10149)
@@ -260,8 +260,9 @@
 
                public function edit()
                {
-                       $activity_id = phpgw::get_var('id');
-                                               
+                       $activity_id = phpgw::get_var('activity_id');
+                       $requirement_id = phpgw::get_var('id');                 
+                       
                        if ($activity_id && is_numeric($activity_id))
                        {
                                $activity = $this->so->get_single($activity_id);
@@ -269,44 +270,37 @@
                        
                        if (isset($_POST['save_requirement']))
                        {
-                               $user_id = $GLOBALS['phpgw_info']['user']['id'];
                                $requirement->set_id( phpgw::get_var('id') );
-                               $requirement->set_name( phpgw::get_var('name') 
);
-                               $requirement->set_update_user( $user_id );
-                               $requirement->set_responsible_user_id( 
phpgw::get_var('responsible_user_id') );
-                               $requirement->set_description( 
phpgw::get_var('description') );
+                               $requirement->set_resource_type_id( 
phpgw::get_var('categories') );
+                               $requirement->set_no_of_elements( 
phpgw::get_var('no_of_elements') );
                                
-                               if( $activity->get_id() == '' | 
$activity->get_id() == 0){
-                                       $activity->set_create_user( $user_id ); 
-                               }
-
                                if(phpgw::get_var('start_date','string') != '')
                                {
                                        $start_date_ts = 
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('start_date','string') );
-                                       
$activity->set_start_date($start_date_ts);
+                                       
$requirement->set_start_date($start_date_ts);
                                }
                                else
                                {
-                                       $activity->set_start_date(0);
+                                       $requirement->set_start_date(0);
                                }
 
                                if( phpgw::get_var('end_date','string') != '')
                                {
                                        $end_date_ts = 
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('end_date','string') );
-                                       $activity->set_end_date($end_date_ts);
+                                       
$requirement->set_end_date($end_date_ts);
                                }
                                else
                                {
-                                       $activity->set_end_date(0);
+                                       $requirement->set_end_date(0);
                                }
 
-                               $activity_id = $this->so->store($activity);
+                               $requirement_id = 
$this->so->store($requirement);
 
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.view', 'id' => $activity_id, 
'project_id' => $activity->get_project_id()));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
                        }
                        else if (isset($_POST['cancel_requirement']))
                        {
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.view', 'id' => $activity_id));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
                        }
                        else
                        {
@@ -322,7 +316,7 @@
                                
                                if($activity_id > 0)
                                {
-                                       $data['activity'] = 
$activity->toArray();
+                                       $data['activity'] = $activity;
                                }
                                
                                
$GLOBALS['phpgw']->jqcal->add_listener('start_date');