[Fmsystem-commits] [10300] Logistic: Added null value to parameter in edit function

[Torstein]

Revision: 10300
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10300
Author:   vator
Date:     2012-10-23 07:16:54 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
Logistic: Added null value to parameter in edit function

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

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-10-23 07:16:14 UTC (rev 
10299)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-23 07:16:54 UTC (rev 
10300)
@@ -307,13 +307,14 @@
                        $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.edit'));
                }
 
-               public function edit($activity)
+               public function edit($activity = null)
                {
+                       
                        $activity_id = phpgw::get_var('id');
                        $parent_activity_id = phpgw::get_var('parent_id');
                        $project_id = phpgw::get_var('project_id');
                        
-                       if ($activity_id && is_numeric($activity_id))
+                       if( !$activity && $activity_id && 
is_numeric($activity_id) )
                        {
                                $activity = $this->so->get_single($activity_id);
                        }
@@ -348,7 +349,7 @@
                                'responsible_users' => $accounts,
                                'activities' => $activities,
                                'activity' => $activity,
-                               'editable' => true,
+                               'editable' => true
                        );
                        
                        if($parent_activity)

Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php  2012-10-23 07:16:14 UTC (rev 
10299)
+++ trunk/logistic/inc/class.uiproject.inc.php  2012-10-23 07:16:54 UTC (rev 
10300)
@@ -481,7 +481,7 @@
                        $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiproject.edit'));
                }
 
-               public function edit($project)
+               public function edit($project = null)
                {
                        $project_id = phpgw::get_var('id');
                        if ($project_id && is_numeric($project_id))

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-10-23 07:16:14 UTC 
(rev 10299)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-10-23 07:16:54 UTC 
(rev 10300)
@@ -310,7 +310,7 @@
                        $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.edit'));
                }
 
-               public function edit($requirement)
+               public function edit($requirement = null)
                {
                        $requirement_id = phpgw::get_var('id');
                        $activity_id = phpgw::get_var('activity_id');