Changeset 15 for types

Timestamp:

Oct 19, 2008, 8:16:37 PM (16 years ago)

Author:

george

Message:

• Upraveno: Mezitabulkovéí odkazy na položky jsou nyní realizovány jako odkazy na id položky(ItemId) namísto id řádku v tabulce(Id).

File:

• types/PointerOneToOne.php (modified) (5 diffs)

types/PointerOneToOne.php

@@ -5 +5 @@
   global $Database, $Lists;
 
+  //print_r($Item);
   $Columns = '';
   $TargetTable = $Type['Parameters'][0];
@@ -10 +11 @@
   foreach($Lists[$TargetTable]['Items'] as $ListItem)
     if($ListItem['VisibleInPointer'] == 1) $Columns .= '`'.$ListItem['Name'].'`," ",';
-  $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, Id';
-  $DbResult = $Database->select($TargetTable, $Columns, 'Id='.$Item['Value']);
+  $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, ItemId, Id';
+  $DbResult = $Database->select($TargetTable, $Columns, 'ItemId='.$Item['Value'].' AND (DeletionTime IS NULL) ORDER BY Id DESC LIMIT 1');
   //echo($Database->LastQuery);
   if($DbResult->num_rows > 0)
@@ -28 +29 @@
   foreach($Lists[$TargetTable]['Items'] as $ListItem)
     if($ListItem['VisibleInPointer'] == 1) $Columns .= 't1.`'.$ListItem['Name'].'`," ",';
-  $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, t1.Id, t1.ItemId';
-  $DbResult = $Database->query('SELECT '.$Columns.' FROM `'.$TargetTable.'` AS t1 LEFT JOIN `'.$TargetTable.'` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)');
+  $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, t1.Id, t1.ItemId, t1.DeletionTime';
+  $DbResult = $Database->query('SELECT t3.* FROM (SELECT '.$Columns.' FROM `'.$TargetTable.'` AS t1 LEFT JOIN `'.$TargetTable.'` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)) AS t3 WHERE t3.DeletionTime IS NULL');
   //echo($Database->LastQuery);
   if($DbResult->num_rows > 0)
@@ -47 +48 @@
   $TargetTable = $Type['Parameters'][0];
   $TargetName = GetTablePointerName($Type, $Item);
-  $Output = '<a href="?Action=ViewItem&amp;Table='.$TargetTable.'&amp;Item='.$TargetName['Id'].'">'.$TargetName['Name'].'</a>';
+  $Output = '<a href="?Action=ViewItem&amp;Table='.$TargetTable.'&amp;Item='.$TargetName['ItemId'].'">'.$TargetName['Name'].'</a>';
   return($Output);
 }
@@ -61 +62 @@
   foreach($TargetNameList as $TargetName)
   {
-    if($Item['Value'] == $TargetName['Id']) $Selected = ' selected="1"'; else $Selected = '';
-    $Output .= '<option value="'.$TargetName['Id'].'"'.$Selected.'>'.$TargetName['Name'].'</option>';
+    if($Item['Value'] == $TargetName['ItemId']) $Selected = ' selected="1"'; else $Selected = '';
+    $Output .= '<option value="'.$TargetName['ItemId'].'"'.$Selected.'>'.$TargetName['Name'].'</option>';
   }
   $Output .= '</select>';