[Fmsystem-commits] [10488]

[Torstein]

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


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/templates/base/css/base.css

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-06 13:41:50 UTC (rev 
10487)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-06 14:27:13 UTC (rev 
10488)
@@ -379,45 +379,31 @@
                        $project_id = phpgw::get_var('project_id');
                        
                        if($activity == null)
-                       {
-                               if( $project_id && is_numeric($project_id) )
-                               {
-                                       $project = 
$this->so_project->get_single($project_id);
-                               }
-                               
+                       {                       
                                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 = new logistic_activity();
                                        
-                                       
$activity->set_start_date($parent_activity->get_start_date());
-                                       
$activity->set_end_date($parent_activity->get_end_date());
+                                       if( $project_id && 
is_numeric($project_id) )
+                                       {
+                                               $project = 
$this->so_project->get_single($project_id);
+                                               $activity->set_project_id( 
$project_id );
+                                       }
+                                       else 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_start_date($parent_activity->get_start_date());
+                                               
$activity->set_end_date($parent_activity->get_end_date());
+                                       }
                                }
-                               else
-                               {
-                                       $projects = $this->so_project->get();
-                               }
                        }
-
-                       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');
                        
@@ -431,22 +417,23 @@
                                'editable' => true,
                                'breadcrumb' => $this->_get_breadcrumb( 
$activity_id, 'logistic.uiactivity.edit', 'id')
                        );
-                       
+                                               
                        if($project)
                        {
                                $data['project'] = $project;
                        }
                        
-                       if($projects)
+                       if($activity->get_parent_id() > 0)
                        {
-                               $data['projects'] = $projects;
+                               $parent_activity = $this->so->get_single( 
$activity->get_parent_id() );
+                               $data['parent_activity'] = $parent_activity;
                        }
-                       
-                       if($parent_activity)
+                       else
                        {
-                               $data['parent_activity'] = $parent_activity;
+                               $projects = $this->so_project->get();
+                               $data['projects'] = $projects;
                        }
-
+                       
                        $this->use_yui_editor('description');
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Add activity');
 

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-06 13:41:50 UTC (rev 
10487)
+++ trunk/logistic/templates/base/css/base.css  2012-11-06 14:27:13 UTC (rev 
10488)
@@ -2447,7 +2447,7 @@
 }
 
 #breadcrumb img{
-       height: 14px;
+       height: 12px;
        margin: 0 5px 0 8px;
 }