[Fmsystem-commits] [7139] Rental: update status on a composite if the status already is set not set to ' Not available'/'Ikke ledig'

[Yngve Espelid]

Revision: 7139
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7139
Author:   yes
Date:     2011-03-24 09:07:34 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Rental:  update status on a composite if the status already is set not set to 
'Not available'/'Ikke ledig'

Modified Paths:
--------------
    trunk/rental/inc/class.socomposite.inc.php

Modified: trunk/rental/inc/class.socomposite.inc.php
===================================================================
--- trunk/rental/inc/class.socomposite.inc.php  2011-03-24 08:32:28 UTC (rev 
7138)
+++ trunk/rental/inc/class.socomposite.inc.php  2011-03-24 09:07:34 UTC (rev 
7139)
@@ -200,10 +200,19 @@
                        
$composite->set_custom_postcode($this->unmarshal($this->db->f('postcode', 
true), 'string'));
                        
$composite->set_custom_place($this->unmarshal($this->db->f('place', true), 
'string'));
                        
$composite->set_area($this->unmarshal($this->db->f('area', true), 'float'));
-                       
$composite->set_status($this->unmarshal($this->db->f('status', true), 
'string'));
                }
                // Location code
                $location_code = $this->unmarshal($this->db->f('location_code', 
true), 'string');
+               
+               //Status
+               $database_status = $this->unmarshal($this->db->f('status', 
true), 'string');
+               $composite_status = $composite->get_status();
+                               
+               if($composite_status != 'Ikke ledig')
+               {
+                       $composite->set_status($database_status);
+               }
+               
                if(!$composite->contains_unit($location_code))
                {
                        //composite inneholder ikke unit -> legg den til