Changeset 31

Timestamp:

Dec 16, 2008, 1:47:05 PM (16 years ago)

Author:

george

Message:

• Upraveno: Nezobrazovat vybraný sloupec v podseznamech.

Files:

• base.php (modified) (3 diffs)
• docs/features.txt (modified) (2 diffs)
• types/PointerOneToOne.php (modified) (6 diffs)

base.php

@@ -10 +10 @@
 {
   global $Database, $Config;
+  
+  echo($Column.','.$ColumnValue.' ');
 
   if(!CheckPermission('Read', $List['Id']))
@@ -22 +24 @@
   foreach($List['Items'] as $Item)
   {
-    if($Item['VisibleInList'] == 1)
+    if(($Item['VisibleInList'] == 1) and ($Item['Name'] != $Column))
       $Output .= '<th><a href="?OrderColumn='.$Item['Name'].'">'.$Item['TextBefore'].'</a></th>';
   }
@@ -71 +73 @@
     foreach($List['Items'] as $Index => $Item)
     {
-      if($Item['VisibleInList'] == 1)
+      if(($Item['VisibleInList'] == 1) and ($Item['Name'] != $Column))
       {
         $ItemDefinition = array('Name' => $Index, 'Value' => $DbRow[$Index], 'SourceTable' => $List['Id'], 'SourceItemId' => $DbRow[$List['IdName']], 'Type' => $Item['Type']);

docs/features.txt

@@ -14 +14 @@
 Unimplemented/planned:
 
+* Full back and forward button history navigation
 * Custom templates
 * Time history, versioning
@@ -29 +30 @@
 * Automatic backup and restore
 * Consistency/integrity check
+* Form definition items manual ordering

types/PointerOneToOne.php

@@ -23 +23 @@
         {
           //print_r($Type);
-          $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $List['TableName'], 'Condition' => 'Id='.$Item['Value']));
+          $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $List['TableName'], 'Condition' => $List['IdName'].'='.$Item['Value']));
           $DbRow = $DbResult->fetch_assoc();
           $DefinitionItem = array('Name' => $Index, 'Type' => $Item['Type'], 'Caption' => $Item['TextBefore'], 'Value' => $DbRow[$Index], 'SourceTable' => $List['Id'], 'SourceItemId' => 0);
@@ -32 +32 @@
     }
     $Columns = substr($Columns, 0, -1);
-    if($Columns == '') $Columns = 'Id AS Name, Id';
-      else $Columns = 'CONCAT('.$Columns.') AS Name, Id';
-    $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $TargetTable, 'Columns' => $Columns, 'Condition' => 'Id='.$Item['Value']));
+    if($Columns == '') $Columns = '`'.$List['IdName'].'` AS `Name`, `'.$List['IdName'].'`';
+      else $Columns = 'CONCAT('.$Columns.') AS `Name`, `'.$List['IdName'].'`';
+    $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $TargetTable, 'Columns' => $Columns, 'Condition' => $List['IdName'].'='.$Item['Value']));
     //echo($Database->LastQuery);
     if($DbResult->num_rows > 0)
@@ -51 +51 @@
     foreach($List['Items'] as $ListItem)
       if($ListItem['VisibleInPointer'] == 1) $Columns .= '`'.$ListItem['Name'].'`," ",';
-    $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, Id';
-    $DbResult = $Database->query('SELECT '.$Columns.' FROM `'.$TargetTable.'`');
+    $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, `'.$List['IdName'].'`';
+    $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $TargetTable, 'Columns' => $Columns));
     //echo($Database->LastQuery);
     if($DbResult->num_rows > 0)
@@ -69 +69 @@
 
     $Type = GetTypeDefinition($Item['Type']);
+    $List = GetListDefinition($Type['Parameters'][0]);
     $TargetTable = $Type['Parameters'][0];
     $TargetName = $this->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[$List['IdName']].'">'.$TargetName['Name'].'</a>';
     return($Output);
   }
@@ -80 +81 @@
 
     $Type = $Types[$Item['Type']];
+    $List = GetListDefinition($Type['Parameters'][0]);
     $Output = '<select name="'.$Item['Name'].'">';
     $TargetNameList = $this->GetTablePointerNameList($Type, $Item);
@@ -85 +87 @@
     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[$List['IdName']]) $Selected = ' selected="1"'; else $Selected = '';
+      $Output .= '<option value="'.$TargetName[$List['IdName']].'"'.$Selected.'>'.$TargetName['Name'].'</option>';
     }
     $Output .= '</select>';