[Fmsystem-commits] [8605]

[Torstein]

Revision: 8605
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8605
Author:   vator
Date:     2012-01-18 12:34:20 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.socase.inc.php
===================================================================
--- trunk/controller/inc/class.socase.inc.php   2012-01-18 12:34:11 UTC (rev 
8604)
+++ trunk/controller/inc/class.socase.inc.php   2012-01-18 12:34:20 UTC (rev 
8605)
@@ -146,7 +146,7 @@
                        
                        $values = array(
                                'check_item_id = ' . 
$this->marshal($case->get_check_item_id(), 'int'),
-                               'status = ' . 
$this->marshal($case->get_status(), 'int'),
+                               'status = ' . $case->get_status(),
                                'location_id = ' . 
$this->marshal($case->get_location_id(), 'int'),
                                'location_item_id = ' . 
$this->marshal($case->get_location_item_id(), 'int'),
                                'descr = ' . $this->marshal($case->get_descr(), 
'string'),

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-01-18 12:34:11 UTC 
(rev 8604)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-01-18 12:34:20 UTC 
(rev 8605)
@@ -113,7 +113,7 @@
                        );
                
                        $location_finder = new location_finder();
-                       $locations = $location_finder->get_responsibilities( 
$criteria );
+                       $my_locations = $location_finder->get_responsibilities( 
$criteria );
                        
                        $controls_for_location_array = 
$this->so_control->get_controls_by_location($location_code, $from_date_ts, 
$to_date_ts, $repeat_type);
                
@@ -133,6 +133,7 @@
                                                        
                        $data = array
                        (               
+                               'my_locations'                    => 
$my_locations,
                                'location_array'                  => 
$location_array,
                                'heading_array'                   => 
$heading_array,
                                'controls_calendar_array' => 
$controls_calendar_array,
@@ -185,8 +186,7 @@
                        );
                
                        $location_finder = new location_finder();
-                       $locations = $location_finder->get_responsibilities( 
$criteria );
-
+                       $my_locations = $location_finder->get_responsibilities( 
$criteria );
                        $repeat_type = null;
                        
                        $controls_for_location_array = 
$this->so_control->get_controls_by_location($location_code, $from_date_ts, 
$to_date_ts, $repeat_type );
@@ -246,6 +246,7 @@
                        
                        $data = array
                        (
+                               'my_locations'                    => 
$my_locations,
                                'location_array'                  => 
$location_array,
                                'heading_array'                   => 
$heading_array,
                                'controls_calendar_array' => 
$controls_calendar_array,