[Fmsystem-commits] [8710]

[Torstein]

Revision: 8710
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8710
Author:   vator
Date:     2012-01-30 11:36:14 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_list.inc.php

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2012-01-30 11:30:42 UTC 
(rev 8709)
+++ trunk/controller/inc/class.socheck_list.inc.php     2012-01-30 11:36:14 UTC 
(rev 8710)
@@ -277,8 +277,7 @@
                        if( $this->db->f('cl_id', true) != $check_list_id ){
                                
                                if($check_list_id != 0){
-                                       
$check_list->set_check_item_array($check_items_array);
-                                       $check_list_array[] = 
$check_list->toArray();
+                                       $check_list_array[] = $check_list;
                                }
                                
                                $check_list = new 
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
@@ -449,10 +448,15 @@
                $sql .= "FROM controller_control c ";
                $sql .= "LEFT JOIN controller_check_list cl on cl.control_id = 
c.id ";
                $sql .= "WHERE cl.location_code = $location_code ";
-               $sql .= "AND c.repeat_type = $repeat_type ";
+               
+               if( is_numeric($repeat_type) )
+                       $sql .= "AND c.repeat_type = $repeat_type ";
+               
                $sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
                $sql .= "ORDER BY c.id;";
 
+               
+               
                $this->db->query($sql);
                
                $control_id = 0;