[Fmsystem-commits] [9259] property: add ticket from controller

[Sigurd Nes]

Revision: 9259
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9259
Author:   sigurdne
Date:     2012-05-02 09:22:14 +0000 (Wed, 02 May 2012)
Log Message:
-----------
property: add ticket from controller

Modified Paths:
--------------
    trunk/property/inc/class.botts.inc.php
    trunk/property/inc/class.sotts.inc.php

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2012-05-02 08:38:56 UTC (rev 
9258)
+++ trunk/property/inc/class.botts.inc.php      2012-05-02 09:22:14 UTC (rev 
9259)
@@ -778,6 +778,7 @@
                 */
                function add_ticket($data)
                {
+
                        $boloc  = CreateObject('property.bolocation');
                        $location_details = 
$boloc->read_single($data['location_code'], array('noattrib' => true));
 
@@ -805,22 +806,22 @@
 
                        $ticket = array
                        (
-                               'origin'    => isset($data['origin']) ? 
$data['origin'] : null,
-                               'origin_id' => isset($data['origin_id']) ? 
$data['origin_id'] : null,
-                               'cat_id'    => $data['cat_id'],
-                               'group_id'  => isset($data['group_id']) && 
$data['group_id'] ? $data['group_id']: $default_group,
-                               'assignedto'=> $assignedto,
-                               'priority'  => isset($data['priority']) && 
$data['priority'] ? $data['priority'] : $default_priority,
-                               'status'    => 'O', // O = Open
-                               'subject'   => $data['title'],
-                               'details'   => $data['details'],
-                               'apply'     => true,
-                               'contact_id'=> 0,
-                               'location'  => $location,
-                               'location_code' => $data['location_code'],
-                               'street_name'   => 
$location_details['street_name'],
-                               'street_number' => 
$location_details['street_number'],
-                               'location_name' => 
$location_details['loc1_name'],
+                               'origin_id'                     => 
isset($data['origin_id']) ? $data['origin_id'] : null,
+                               'origin_item_id'        => 
isset($data['origin_item_id']) ? $data['origin_item_id'] : null,
+                               'cat_id'                        => 
$data['cat_id'],
+                               'group_id'              => 
isset($data['group_id']) && $data['group_id'] ? $data['group_id']: 
$default_group,
+                               'assignedto'            => $assignedto,
+                               'priority'                      => 
isset($data['priority']) && $data['priority'] ? $data['priority'] : 
$default_priority,
+                               'status'                        => 'O', // O = 
Open
+                               'subject'                       => 
$data['title'],
+                               'details'                       => 
$data['details'],
+                               'apply'                         => true,
+                               'contact_id'            => 0,
+                               'location'                      => $location,
+                               'location_code'         => 
$data['location_code'],
+                               'street_name'           => 
$location_details['street_name'],
+                               'street_number'         => 
$location_details['street_number'],
+                               'location_name'         => 
$location_details['loc1_name'],
                        );
 
                        $result = $this->add($ticket);

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2012-05-02 08:38:56 UTC (rev 
9258)
+++ trunk/property/inc/class.sotts.inc.php      2012-05-02 09:22:14 UTC (rev 
9259)
@@ -757,20 +757,26 @@
                        {
                                if($ticket['origin'][0]['data'][0]['id'])
                                {
-                                       $interlink_data = array
-                                               (
-                                                       'location1_id'          
=> $GLOBALS['phpgw']->locations->get_id('property', 
$ticket['origin'][0]['location']),
-                                                       'location1_item_id' => 
$ticket['origin'][0]['data'][0]['id'],
-                                                       'location2_id'          
=> $GLOBALS['phpgw']->locations->get_id('property', '.ticket'),
-                                                       'location2_item_id' => 
$id,
-                                                       'account_id'            
=> $this->account
-                                               );
-
-                                       $interlink      = 
CreateObject('property.interlink');
-                                       
$interlink->add($interlink_data,$this->db);
+                                       $ticket['origin_id'] = 
$GLOBALS['phpgw']->locations->get_id('property', 
$ticket['origin'][0]['location']);
+                                       $ticket['origin_item_id'] = 
$ticket['origin'][0]['data'][0]['id'];
                                }
                        }
 
+                       if(isset($ticket['origin_id']) && $ticket['origin_id'] 
&& isset($ticket['origin_item_id']) && $ticket['origin_item_id'])
+                       {
+                               $interlink_data = array
+                                       (
+                                               'location1_id'          => 
$ticket['origin_id'],
+                                               'location1_item_id' => 
$ticket['origin_item_id'],
+                                               'location2_id'          => 
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'),
+                                               'location2_item_id' => $id,
+                                               'account_id'            => 
$this->account
+                                       );
+
+                               $interlink      = 
CreateObject('property.interlink');
+                               $interlink->add($interlink_data,$this->db);
+                       }
+
                        if($this->db->transaction_commit())
                        {
                                $this->historylog->add('O',$id, time(),'');