[Fmsystem-commits] [6909] property: fix 'related' from entities

[Sigurd Nes]

Revision: 6909
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6909
Author:   sigurdne
Date:     2011-02-02 15:32:05 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
property: fix 'related' from entities

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

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2011-02-02 08:25:07 UTC (rev 
6908)
+++ trunk/property/inc/class.soentity.inc.php   2011-02-02 15:32:05 UTC (rev 
6909)
@@ -932,7 +932,7 @@
 
                        $cat_id = (int)$data['cat_id'];
                        $entity_id = (int)$data['entity_id'];
-                       $id = (int)$data['id'];
+                       $id = $data['id'];
 
                        $entity = array();
 
@@ -1002,7 +1002,7 @@
                                        //      'p_entity_id'   => $entity_id,
                                        //      'p_cat_id'              => 
$cat_id,
                                                'p_num'                 => $id,
-                                               'query'=> 
"entity.{$entry['entity_id']}.{$entry['cat_id']}.{$id}")),
+                                               'query'=> 
"entity.{$entity_id}.{$cat_id}.{$id}")),
                                                'name'          => 
lang('Helpdesk') . " [{$hits}]",
                                                'descr'         => 
lang('Helpdesk')
                                        );
@@ -1020,7 +1020,7 @@
                                        //      'p_entity_id'   => $entity_id,
                                        //      'p_cat_id'              => 
$cat_id,
                                                'p_num'                 => $id,
-                                               'query'=> 
"entity.{$entry['entity_id']}.{$entry['cat_id']}.{$id}")),
+                                               'query'=> 
"entity.{$entity_id}.{$cat_id}.{$id}")),
                                                'name'          => 
lang('request') . " [{$hits}]",
                                                'descr'         => 
lang('request')
                                        );
@@ -1035,7 +1035,7 @@
                                $entity['related'][] = array
                                        (
                                                'entity_link'   => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'property.uiproject.index',
-                                               'query'=> 
"entity.{$entry['entity_id']}.{$entry['cat_id']}.{$id}",
+                                               'query'=> 
"entity.{$entity_id}.{$cat_id}.{$id}",
                                                'criteria_id' => 6)), //FIXME: 
criteria 6 is for entities should be altered to locations
                                                'name'          => 
lang('project') . " [{$hits}]",
                                                'descr'         => 
lang('project')

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2011-02-02 08:25:07 UTC (rev 
6908)
+++ trunk/property/inc/class.sotts.inc.php      2011-02-02 15:32:05 UTC (rev 
6909)
@@ -421,7 +421,7 @@
                                        else
                                        {
                                                $query=explode(".",$query);
-                                               $querymethod .= " OR 
(fm_tts_tickets.p_entity_id='" . (int)$query[1] . "' AND 
fm_tts_tickets.p_cat_id='" . (int)$query[2] . "' AND fm_tts_tickets.p_num='" . 
(int)$query[3] . "'))";
+                                               $querymethod = " {$where} 
(fm_tts_tickets.p_entity_id='" . (int)$query[1] . "' AND 
fm_tts_tickets.p_cat_id='" . (int)$query[2] . "' AND 
fm_tts_tickets.p_num='{$query[3]}')";
                                        }
                                }
                                else
@@ -598,7 +598,6 @@
 
                function add($ticket)
                {
-
                        if(isset($ticket['location']) && 
is_array($ticket['location']))
                        {
                                foreach ($ticket['location'] as $input_name => 
$value)

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2011-02-02 08:25:07 UTC (rev 
6908)
+++ trunk/property/inc/class.uientity.inc.php   2011-02-02 15:32:05 UTC (rev 
6909)
@@ -1750,7 +1750,7 @@
  */                    
                        if ($id)
                        {
-                               $related = 
$this->bo->read_entity_to_link(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'id'=>$id));
+                               $related = 
$this->bo->read_entity_to_link(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'id'=>$values['num']));
                                $related_link = array();
 
                                if(isset($related['related']))