[Fmsystem-commits] [12527] property: add attribute values to return data

[Sigurd Nes]

Revision: 12527
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12527
Author:   sigurdne
Date:     2015-01-04 16:39:58 +0000 (Sun, 04 Jan 2015)
Log Message:
-----------
property: add attribute values to return data

Modified Paths:
--------------
    trunk/property/inc/class.solocation.inc.php

Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2015-01-02 23:11:45 UTC (rev 
12526)
+++ trunk/property/inc/class.solocation.inc.php 2015-01-04 16:39:58 UTC (rev 
12527)
@@ -1196,6 +1196,11 @@
                                return $location[$location_code];
                        }
 
+                       if(!isset($values['attributes']) || ! 
$values['attributes'])
+                       {
+                               $values['attributes'] = 
$this->custom->find('property','.location.' . $type_id, 0, '', 'ASC', 
'attrib_sort', true, true);
+                       }
+
                        $cols = "fm_location{$type_id}.category as cat_id";
                        $cols .= ",fm_location{$type_id}_category.descr as 
category_name";
                        $cols_return[]  = 'cat_id';
@@ -1257,6 +1262,10 @@
                                        foreach ( $values['attributes'] as 
&$attr )
                                        {
                                                $attr['value']  = 
$this->db->f($attr['column_name']);
+                                               if($attr['lookup_form'])
+                                               {
+                                                       
$values[$attr['column_name']] = $attr['value'];
+                                               }
                                        }
                                }
                        }