[Fmsystem-commits] [8790] controller: ticket integration

[Sigurd Nes]

Revision: 8790
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8790
Author:   sigurdne
Date:     2012-02-06 07:42:35 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
controller: ticket integration

Modified Paths:
--------------
    trunk/controller/inc/class.socase.inc.php
    trunk/controller/inc/class.socheck_item.inc.php
    trunk/controller/inc/class.uicase.inc.php

Modified: trunk/controller/inc/class.socase.inc.php
===================================================================
--- trunk/controller/inc/class.socase.inc.php   2012-02-06 06:38:01 UTC (rev 
8789)
+++ trunk/controller/inc/class.socase.inc.php   2012-02-06 07:42:35 UTC (rev 
8790)
@@ -81,10 +81,10 @@
                        }
                }
                
-               public function get_cases_by_message($message_ticket_id, 
$return_type = "return_object")
+               public function get_cases_by_message($location_id, 
$location_item_id, $return_type = "return_object")
                {
                        $sql = "SELECT * FROM controller_check_item_case "; 
-                       $sql .= "WHERE location_item_id = $message_ticket_id";
+                       $sql .= "WHERE location_id = {$location_id} AND 
location_item_id = {$location_item_id}";
 
                        $this->db->query($sql);
 

Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php     2012-02-06 06:38:01 UTC 
(rev 8789)
+++ trunk/controller/inc/class.socheck_item.inc.php     2012-02-06 07:42:35 UTC 
(rev 8790)
@@ -471,11 +471,14 @@
                        }
                }
                
-               public function get_check_items_by_message($message_ticket_id, 
$return_type = "return_array" ){
+               public function get_check_items_by_message($location_id, 
$location_item_id, $return_type = "return_array" )
+               {
+                       $location_id            = (int)$location_id;
+                       $location_item_id       = (int)$location_item_id;
                        $sql  = "SELECT ci.* "; 
                        $sql .= "FROM controller_check_item ci "; 
                        $sql .= "LEFT JOIN controller_check_item_case as cic ON 
ci.id = cic.check_item_id ";
-                       $sql .= "WHERE cic.location_item_id = 
$message_ticket_id ";
+                       $sql .= "WHERE cic.location_id = {$location_id} AND 
cic.location_item_id = {$location_item_id} ";
                                                                
                        $this->db->query($sql);
                        

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2012-02-06 06:38:01 UTC (rev 
8789)
+++ trunk/controller/inc/class.uicase.inc.php   2012-02-06 07:42:35 UTC (rev 
8790)
@@ -298,14 +298,14 @@
                
                public function updateStatusForCases($location_id, 
$location_item_id, $updateStatus = 0){
                        
-                       $cases_array = $this->so->get_cases_by_message( 
$location_item_id );
+                       $cases_array = $this->so->get_cases_by_message( 
$location_id, $location_item_id );
                        
                        foreach($cases_array as $case){
                                $case->set_status( $updateStatus );
                                $this->so->update( $case );     
                        }
                        
-                       $check_items = 
$this->so_check_item->get_check_items_by_message($message_ticket_id, 
"return_object");
+                       $check_items = 
$this->so_check_item->get_check_items_by_message($location_id, 
$location_item_id, "return_object");
                        
                        if($updateStatus == 0){