Changeset 26 for types

Timestamp:

Dec 4, 2008, 12:31:09 PM (16 years ago)

Author:

george

Message:

• Opraveno: Logování správných id položek.
• Upraveno: Částečně zprovozněno vícestupňové zobrazení odkazů.

Location:

types

Files:

• PointerOneToOne.php (modified) (2 diffs)
• include.php (modified) (1 diff)

types/PointerOneToOne.php

@@ -11 +11 @@
     $List = GetListDefinition($Type['Parameters'][0]);
     $TargetTable = $List['TableName'];
-    foreach($List['Items'] as $ListItem)
-      if($ListItem['VisibleInPointer'] == 1) $Columns .= '`'.$ListItem['Name'].'`," ",';
+    foreach($List['Items'] as $Index => $ListItem)
+    {
+      //echo('ListItem');
+      //print_r($ListItem);
+      $Type = GetTypeDefinition($ListItem['Type']);
+      if($ListItem['VisibleInPointer'] == 1)
+      {
+        if($Type['ParentType'] == TypePointerOneToOneId)
+        {
+          //print_r($Type);
+          $DbResult = $Database->select($List['TableName'], '*', 'ItemId='.$Item['Value'].' ORDER BY Id DESC LIMIT 1');
+          $DbRow = $DbResult->fetch_assoc();
+          $DefinitionItem = array('Name' => $Index, 'Type' => $Item['Type'], 'Caption' => $Item['TextBefore'], 'Value' => $DbRow[$Index], 'SourceTable' => $List['ItemId'], 'SourceItemId' => 0);
+          $SubTarget = $this->GetTablePointerName($Type, $DefinitionItem);
+          $Columns .= '"'.$SubTarget['Name'].' ",';
+        } else $Columns .= '`'.$ListItem['Name'].'`," ",';
+      }
+    }
     $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);
+    echo($Database->LastQuery);
     if($DbResult->num_rows > 0)
     {
@@ -36 +52 @@
     if($DbResult->num_rows > 0)
     {
+
       $Result = array(array('Name' => 'Žádný', 'Id' => 0, 'ItemId' => 0));
       while($DbRow = $DbResult->fetch_assoc())

types/include.php

@@ -16 +16 @@
 include('types/File/File.php');
 include('types/GPS.php');
+include('types/IPv4Address.php');
 
 define("TypeIntegerId", 1);