[Fmsystem-commits] [10366]

[Torstein]

Revision: 10366
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10366
Author:   vator
Date:     2012-10-29 12:38:33 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------


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

Modified: trunk/logistic/inc/class.soactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.soactivity.inc.php 2012-10-29 12:37:52 UTC (rev 
10365)
+++ trunk/logistic/inc/class.soactivity.inc.php 2012-10-29 12:38:33 UTC (rev 
10366)
@@ -182,7 +182,6 @@
 
                        $condition =  join(' AND ', $clauses);
 
-                       //$joins = " {$this->left_join} controller_control_area 
ON (controller_procedure.control_area_id = controller_control_area.id)";
                        $tables = "lg_activity activity";
 
                        if($return_count) // We should only return a count
@@ -197,8 +196,6 @@
                        $dir = $ascending ? 'ASC' : 'DESC';
                        $order = $sort_field ? "ORDER BY 
{$this->marshal($sort_field, 'field')} $dir ": '';
 
-                       //var_dump("SELECT {$cols} FROM {$tables} {$joins} 
WHERE {$condition} {$order}");
-
                        return "SELECT {$cols} FROM {$tables} WHERE 
{$condition} {$order}";
                }
 
@@ -260,7 +257,6 @@
                        }
 
                        $sql = $this->get_query($sort_field, $ascending, 
$search_for, $search_type, $filters, false);
-
                        $ret = $this->read_tree($sql, $filters);
 
                        return $ret;
@@ -308,6 +304,10 @@
                        {
                                $filter_clause = "activity.id = 
{$this->marshal($filters['activity'], 'int')}";
                        }
+                       else if($filters['id'])
+                       {
+                               $filter_clause = "activity.id = 
{$this->marshal($filters['id'], 'int')}";
+                       }
                        else
                        {
                                $filter_clause = "(parent_activity_id = 0 OR 
parent_activity_id IS NULL)";