Changeset 26

Timestamp:

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

Author:

george

Message:

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

Files:

• base.php (modified) (4 diffs)
• lists/SystemList.php (modified) (1 diff)
• lists/SystemListItem.php (modified) (2 diffs)
• types/PointerOneToOne.php (modified) (2 diffs)
• types/include.php (modified) (1 diff)

base.php

@@ -217 +217 @@
   $System->Modules['DatabaseList']->EditItem($List['ItemId'], $Form->Values, $Id);
   $NewId = $Database->insert_id;
-  $System->Modules['Log']->Add($List['Id'], $NewId, $LogActionType['Edit']);
+  $System->Modules['Log']->Add($List['ItemId'], $NewId, $LogActionType['Edit']);
   $Output = 'Změny uloženy.';
   $Output .= ShowViewItem($List, $Id);
@@ -302 +302 @@
   $NewItemId = $System->Modules['DatabaseList']->AddItem($List['ItemId'], $Form->Values);
   $NewId = $Database->insert_id;
-  $System->Modules['Log']->Add($List['Id'], $NewId, $LogActionType['Add']);
+  $System->Modules['Log']->Add($List['ItemId'], $NewId, $LogActionType['Add']);
   $Output = 'Položka přidána';
   $Output .= ShowViewItem($List, $NewItemId);
@@ -346 +346 @@
     }
     $Output .= ' <a href="?Action=ShowHistory&amp;Table='.$List['ItemId'].'&amp;Item='.$DbRow['ItemId'].'">Historie</a>';
+    $Output .= ' <a href="?Action=DeleteItem&amp;Table='.$List['ItemId'].'&amp;Item='.$DbRow['ItemId'].'"  onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
     $Output .= '<div class="line"></div>';
     foreach($List['Items'] as $Index => $Item)
@@ -365 +366 @@
 
   if(!CheckPermission('Write', $List['ItemId'])) return(SystemMessage('Řízení přístupu', 'Nemáte dostatečná oprávnění'));
-  $System->Modules['Log']->Add($List['Id'], $Id, $LogActionType['Delete']);
+  $System->Modules['Log']->Add($List['ItemId'], $Id, $LogActionType['Delete']);
   $System->Modules['DatabaseList']->DeleteItem($List['ItemId'], $Id);
   $Output = 'Položka smazána.';

lists/SystemList.php

@@ -17 +17 @@
     PRIMARY KEY  (`Id`)
     ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;');
+    $Database->query('ALTER TABLE `'.$Parameters['TableName'].'` ADD INDEX ( `ItemId` );');
     //echo($Database->LastQuery);
   }

lists/SystemListItem.php

@@ -3 +3 @@
 class ListSystemListItem
 {
+  function RebuildOrder()
+  {
+    global $Database;
+
+    $Database->query('UPDATE SystemListItem AS Table1 SET Sequence = (SELECT COUNT(*) FROM (SELECT * FROM SystemListItem) AS Table2 WHERE (Table1.ItemId = Table2.ItemId) AND ((Table2.Sequence < Table1.Sequence) OR ((Table1.Sequence = Table2.Sequence) AND (Table2.Id < Table1.Id))))');
+  }
+
   function OnAdd($Parameters)
   {
@@ -16 +23 @@
     $Database->query('ALTER TABLE `'.$DbRow2['TableName'].'` ADD `'.$Parameters['Name'].'` '.$DbRow['DbDataType'].' NOT NULL ;');
     //echo($Database->LastQuery);
+
+    $this->RebuildOrder();
+  }
+
+  function OnEdit($Parameters)
+  {
+    $this->RebuildOrder();
+  }
+
+  function OnDelete($Parameters)
+  {
+    $this->RebuildOrder();
   }
 }

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);