[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6910] Merge 6908:6909 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6910] Merge 6908:6909 from trunk |
|
Date: |
Wed, 02 Feb 2011 15:34:11 +0000 |
Revision: 6910
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6910
Author: sigurdne
Date: 2011-02-02 15:34:11 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Merge 6908:6909 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.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
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-02-02 15:32:05 UTC (rev 6909)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-02-02 15:34:11 UTC (rev 6910)
@@ -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: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-02-02 15:32:05 UTC (rev 6909)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-02-02 15:34:11 UTC (rev 6910)
@@ -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: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-02-02 15:32:05 UTC (rev 6909)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-02-02 15:34:11 UTC (rev 6910)
@@ -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']))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6910] Merge 6908:6909 from trunk,
Sigurd Nes <=