Changeset 38 for trunk/base.php

Timestamp:

May 12, 2009, 11:30:51 AM (16 years ago)

Author:

george

Message:

• Přidáno: Typy Color pro výběr barvy a Text pro psaní obsáhlejších textů.
• Opraveno: Ukládání položek do jiných databází než v které je systém.

File:

• trunk/base.php (modified) (9 diffs)

trunk/base.php

@@ -51 +51 @@
   if(array_key_exists('OrderColumn', $_GET))
   {
-    if($_SESSION['OrderTable'] != $List['Id']) // Different table => set ascending order
+    if(array_key_exists('OrderTable', $_SESSION) and ($_SESSION['OrderTable'] != $List['Id'])) // Different table => set ascending order
       $_SESSION['OrderDirection'] = 0;
     $_SESSION['OrderColumn'] = $_GET['OrderColumn'];
@@ -222 +222 @@
       if($Type['BaseType'] != 'PointerOneToMany')
       {
-        $DefinitionItems[] = array('Name' => $Index, 'Caption' => $Item['TextBefore'].$Required, 'Value' => $DbRow[$Index], 'SourceTable' => $List['Id'], 'SourceItemId' => $DbRow[$List['IdName']], 'Type' => $Item['Type']);
-      }
+        if($Item['Editable'] == 1)
+        {
+          $DefinitionItems[] = array('Name' => $Index, 'Caption' => $Item['TextBefore'], 'Value' => $DbRow[$Index], 'SourceTable' => $List['Id'], 'SourceItemId' => $DbRow[$List['IdName']], 'Type' => $Item['Type']);
+        } else $DefinitionItems[] = array('Name' => $Index, 'Type' => TypeHiddenId, 'Caption' => '', 'Value' => $DbRow[$Index]);
+      } 
     }
   }
@@ -239 +242 @@
   $Output = 'Změny uloženy.';
   $Output .= ShowViewItem($List, $Id);
-  $Form->Values['Column'] = $_POST['Column'];
+  if(array_key_exists('Column', $_POST)) $Form->Values['Column'] = $_POST['Column'];
+    else $Form->Values['Column'] = '';
   $Form->Values['Id'] = $Id;
   $Form->Values['ListTableName'] = $List['TableName'];
@@ -279 +283 @@
   );
   $Form->OnSubmit = '?Action=AddItemFinish';
-  $Output .= $Form->ShowEditForm().$AfterTableOutput;
+  $Output = $Form->ShowEditForm().$AfterTableOutput;
   if(($Column != '') and ($ColumnValue != 0))
   {
@@ -297 +301 @@
   $DefinitionItems = array();
   $AfterTableOutput = '';
+  if(array_key_exists('Column', $_GET)) $Column = $_GET['Column']; else $Column = '';
   foreach($List['Items'] as $Item)
   {
@@ -401 +406 @@
   $DefinitionItems = array();
   $AfterTableOutput = '';
+  if(array_key_exists('Column', $_GET)) $Column = $_GET['Column']; else $Column = '';
   foreach($List['Items'] as $Item)
   {
@@ -425 +431 @@
   );
   $Form->OnSubmit = '?Action=Search';
-  $Output .= $Form->ShowEditForm();
+  $Output = $Form->ShowEditForm();
   return($Output);
 }
@@ -436 +442 @@
   $DefinitionItems = array();
   $AfterTableOutput = '';
+  if(array_key_exists('Column', $_GET)) $Column = $_GET['Column']; else $Column = '';
   foreach($List['Items'] as $Item)
   {
@@ -649 +656 @@
     $ListObject = $ListDefinition['Class'];
     if(is_callable(array($ListObject, $Event))) return($ListObject->$Event($Parameters));
-      else return($ListDefinition['TableName'].'->'.$Event.'('.$List.')');
-  } else return($ListDefinition['TableName'].'->'.$Event.'('.$List.')');
+      else return($ListDefinition['TableName'].'->'.$Event.'('.$Table.')');
+  } else return($ListDefinition['TableName'].'->'.$Event.'('.$Table.')');
 }