[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10309] Logistic: Fixed small bug
From: |
Torstein |
Subject: |
[Fmsystem-commits] [10309] Logistic: Fixed small bug |
Date: |
Tue, 23 Oct 2012 09:10:26 +0000 |
Revision: 10309
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10309
Author: vator
Date: 2012-10-23 09:10:25 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
Logistic: Fixed small bug
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-23 09:09:50 UTC (rev
10308)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-23 09:10:25 UTC (rev
10309)
@@ -309,37 +309,39 @@
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 && $activity_id &&
is_numeric($activity_id) )
+ if($activity == null)
{
- $activity = $this->so->get_single($activity_id);
- }
- else
- {
- if($activity == null)
+ if( $activity_id && is_numeric($activity_id) )
{
+ $activity =
$this->so->get_single($activity_id);
+ }
+ else
+ {
$activity = new logistic_activity();
}
+
+ if($activity->get_project_id() == '')
+ {
+ $activity->set_project_id( $project_id
);
+ }
+
+ if($parent_activity_id > 0)
+ {
+ $activity->set_parent_id(
$parent_activity_id );
+ $parent_activity =
$this->so->get_single( $parent_activity_id );
+ $activity->set_project_id(
$parent_activity->get_project_id() );
+ }
}
- $activity->set_project_id( $project_id );
-
- if($parent_activity_id > 0)
- {
- $activity->set_parent_id( $parent_activity_id );
- $parent_activity = $this->so->get_single(
$parent_activity_id );
- $activity->set_project_id(
$parent_activity->get_project_id() );
- }
-
if($activity->get_parent_id() > 0)
{
$parent_activity = $this->so->get_single(
$activity->get_parent_id() );
}
-
+
$accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
$activities = $this->so->get();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10309] Logistic: Fixed small bug,
Torstein <=