[Fmsystem-commits] [6764] property: differential location on orders from helpdesk via existing projects

[Sigurd Nes]

Revision: 6764
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6764
Author:   sigurdne
Date:     2011-01-13 19:29:36 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
property: differential location on orders from helpdesk via existing projects

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

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2011-01-13 14:14:05 UTC 
(rev 6763)
+++ trunk/property/inc/class.uiworkorder.inc.php        2011-01-13 19:29:36 UTC 
(rev 6764)
@@ -867,6 +867,8 @@
                                {
                                        $values['descr'] .= ": " . 
$ticket_notes[$i]['value_note'];
                                }
+
+                               $values['location_data'] = 
$ticket['location_data'];
                        }
 
                        if(isset($values['origin']) && $values['origin'])
@@ -1211,8 +1213,15 @@
                                $location_template_type = 'form';
                                $_location_data = array();
 
-                               if(isset($values['location_data']) && 
$values['location_data'])
+                               if(!$values['location_data'] && $origin_id)
                                {
+                                       $location_code = 
isset($values['location_code']) && $values['location_code'] ? 
$values['location_code'] : implode("-", $values['location']);
+                                       $values['extra']['view'] = true;
+                                       $values['location_data'] = 
$bolocation->read_single($location_code,$values['extra']);
+                               }
+
+                               if($values['location_data'])
+                               {
                                        $_location_data = 
$values['location_data'];
                                }
                                else