[Fmsystem-commits] [7235] Merge 7232:7234 from trunk

[Sigurd Nes]

Revision: 7235
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7235
Author:   sigurdne
Date:     2011-04-26 12:57:28 +0000 (Tue, 26 Apr 2011)
Log Message:
-----------
Merge 7232:7234 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234

Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php    
2011-04-26 12:52:23 UTC (rev 7234)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php    
2011-04-26 12:57:28 UTC (rev 7235)
@@ -1886,7 +1886,7 @@
                                                                (
                                                                        
'valueset'              => false,
                                                                        
'method'                => 'property.bogeneric.get_list',
-                                                                       
'method_input'  => array('type' => 'custom_menu_items', 'role' => 'parent', 
'selected' => '##parent_id##')
+                                                                       
'method_input'  => array('type' => 'custom_menu_items', 'role' => 'parent', 
'selected' => '##parent_id##', 'mapping' => array('name' => 'text'))
                                                                )
                                                        ),
                                                        array
@@ -2491,18 +2491,23 @@
 
                        $return_fields = isset($data['fields']) && 
$data['fields'] && is_array($data['fields']) ? $data['fields'] : array();
 //-----------
+                       $mapping = array();
+                       if(isset($data['mapping']) && $data['mapping'])
+                       {
+                               $mapping = $data['mapping'];
+                       }
+                       else
+                       {
+                               $mapping = array('name' => 'name');
+                       }
 
-
                        $values = array();
                        $i = 0;
                        while ($this->_db->next_record())
                        {
                                $_extra = $this->_db->f($id_in_name);
                                $id             = $this->_db->f('id');
-                               if(!$name = $this->_db->f('name', true))
-                               {
-                                       $name   = $this->_db->f('descr', true);
-                               }
+                               $name   = $this->_db->f($mapping['name'], true);
 
                                if($_extra)
                                {
@@ -2530,13 +2535,23 @@
                        foreach($values as $value)
                        {
                                $this->tree[] = $value;
-                               $this->get_children2($value['id'], 1);
+                               $this->get_children2($data, $value['id'], 1);
                        }
                        return $this->tree;
                }
 
-               public function get_children2($parent, $level, $reset = false)
+               public function get_children2($data, $parent, $level, $reset = 
false)
                {
+                       $mapping = array();
+                       if(isset($data['mapping']) && $data['mapping'])
+                       {
+                               $mapping = $data['mapping'];
+                       }
+                       else
+                       {
+                               $mapping = array('name' => 'name');
+                       }
+
                        if($reset)
                        {
                                $this->tree = array();
@@ -2555,7 +2570,7 @@
                                $this->tree[] = array
                                (
                                        'id'            => $id,
-                                       'name'          => 
str_repeat('..',$level) . $db->f('name',true),
+                                       'name'          => 
str_repeat('..',$level) . $db->f($mapping['name'],true),
                                        'parent_id'     => $db->f('parent_id')
                                );
                                $this->get_children2($id, $level+1);