[Fmsystem-commits] [11506] fix location listing

[Sigurd Nes]

Revision: 11506
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11506
Author:   sigurdne
Date:     2013-12-05 17:30:49 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
fix location listing

Modified Paths:
--------------
    trunk/property/inc/class.bocommon.inc.php
    trunk/property/inc/class.soentity.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2013-12-05 15:45:01 UTC (rev 
11505)
+++ trunk/property/inc/class.bocommon.inc.php   2013-12-05 17:30:49 UTC (rev 
11506)
@@ -1142,9 +1142,12 @@
                        $GLOBALS['phpgw']->config->read();
                        $list_location_level = 
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) && 
$GLOBALS['phpgw']->config->config_data['list_location_level'] ? 
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
 
-                       if($list_location_level > $location_level)
+                       if(!$list_location_level)
                        {
-                               $list_location_level = $location_level;
+                               for ($i=0; $i<$location_level; $i++)
+                               {
+                                       $list_location_level[] =  $i + 1;
+                               }
                        }
 
                        $soadmin_location       = 
CreateObject('property.soadmin_location');

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2013-12-05 15:45:01 UTC (rev 
11505)
+++ trunk/property/inc/class.soentity.inc.php   2013-12-05 17:30:49 UTC (rev 
11506)
@@ -2161,8 +2161,9 @@
                                                {
                                                        
$history_set[$entry['attrib_id']] = array
                                                        (
-                                                               'value' => 
$entry['value'],
-                                                               'date'  => 
$this->bocommon->date_to_timestamp($entry['date'])
+                                                               'value'         
=> $entry['value'],
+                                                               'old_value'     
=> $old_value,
+                                                               'date'          
=> $this->bocommon->date_to_timestamp($entry['date'])
                                                        );
                                                }
                                        }
@@ -2207,7 +2208,7 @@
                                $historylog     = 
CreateObject('property.historylog',"{$this->type}_{$entity_id}_{$cat_id}");
                                foreach ($history_set as $attrib_id => $history)
                                {
-                                       
$historylog->add('SO',$values['id'],$history['value'],false, 
$attrib_id,$history['date']);
+                                       
$historylog->add('SO',$values['id'],$history['value'],$history['old_value'], 
$attrib_id,$history['date']);
                                }
                        }
 

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2013-12-05 15:45:01 UTC (rev 
11505)
+++ trunk/property/inc/class.uientity.inc.php   2013-12-05 17:30:49 UTC (rev 
11506)
@@ -2680,7 +2680,7 @@
                                                'id'                            
=> $entry['id'],
                                                'value'                         
=> $entry['new_value'],
                                                'user'                          
=> $entry['owner'],
-                                               'time_created'                  
=> $GLOBALS['phpgw']->common->show_date($entry['datetime'],$dateformat),
+                                               'time_created'                  
=> $GLOBALS['phpgw']->common->show_date($entry['datetime'],"{$dateformat} 
G:i:s"),
                                                'link_delete'                   
=> $link_delete,
                                                'lang_delete_statustext'        
=> lang('delete the item'),
                                                'text_delete'                   
=> $text_delete,

Modified: trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php
===================================================================
--- trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php        
2013-12-05 15:45:01 UTC (rev 11505)
+++ trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php        
2013-12-05 17:30:49 UTC (rev 11506)
@@ -82,7 +82,7 @@
                        }
                        else
                        {
-                               $PeriodTo = 000000;                     
+                               $PeriodTo = '000000';                   
                        }
 
                        $memory = xmlwriter_open_memory();