[Fmsystem-commits] [11062] logistics

[Sigurd Nes]

Revision: 11062
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11062
Author:   sigurdne
Date:     2013-04-18 11:15:13 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
logistics

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

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2013-04-18 11:14:48 UTC (rev 
11061)
+++ trunk/property/inc/class.soentity.inc.php   2013-04-18 11:15:13 UTC (rev 
11062)
@@ -1684,7 +1684,22 @@
                        $_short_description = array();
                        foreach ($prop_array['attributes'] as $attribute)
                        {
-                               $short_description[] = 
"{$attribute['input_text']}: {$attribute['value']}";
+                               $description_value = $attribute['value'];
+
+                               
if(isset($cache_attributes[$location_id]['attributes'][$attribute['value']]['choice'])
 && 
$cache_attributes[$location_id]['attributes'][$attribute['value']]['choice'])
+                               {
+                                       $choice = 
$cache_attributes[$location_id]['attributes'][$attribute['value']]['choice'];
+                                       foreach($choice as $choice_value)
+                                       {
+                                               if ($choice_value['id'] == 
$attribute['value'])
+                                               {
+                                                       $description_value = 
$choice_value['value'];
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               $short_description[] = 
"{$attribute['input_text']}: {$description_value}";
                        }
 
                        $short_description = implode(', ', $short_description);