Changeset 483 for trunk

Timestamp:

Feb 7, 2013, 11:01:56 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: OneToMany vazba ve formulářích nyní využívá rozšířenou definici tabulky pomocí pole 'View'.
• Přidáno: Zobrazení síťových propojení ve správě dat.

Location:

trunk

Files:

• Common/Types/OneToMany.php (modified) (2 diffs)
• form_classes.php (modified) (4 diffs)
• sql/updates/483.sql (added)

trunk/Common/Types/OneToMany.php

@@ -10 +10 @@
     if($Item['Value'] != '')
     {
+      if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
+        else $Table = $Type['Parameters']['Table'];
       $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].
-        ' AS `Name` FROM `'.$Type['Parameters']['Table'].'` WHERE `'.
+        ' AS `Name` FROM '.$Table.' WHERE `'.
         $Type['Parameters']['Id'].'`='.$Item['Value']);
       $DbRow = $DbResult->fetch_assoc();
@@ -31 +33 @@
       $Output .= '<option value=""'.$Selected.'></option>';
     }
-    $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].' AS `Name`,'.$Type['Parameters']['Id'].' AS `Id` FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY `Name`');
+    if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
+      else $Table = $Type['Parameters']['Table'];
+    $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].' AS `Name`,'.$Type['Parameters']['Id'].' AS `Id` FROM '.$Table.''.$Where.' ORDER BY `Name`');
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/form_classes.php

@@ -16 +16 @@
 
 $FormClasses = array(    
+  'NetworkLink' => array(
+    'Title' => 'Síťové propojení',
+    'Table' => 'NetworkLink',
+    'Items' => array(
+      'Type' => array('Type' => 'Integer', 'Caption' => 'Typ', 'Default' => '1'),
+      'Interface1' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 1', 'Default' => ''),
+      'Interface2' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 2', 'Default' => ''),
+    ),
+  ),
   'PermissionUserAssignment' => array(
     'Title' => 'Oprávnění uživatelů',
@@ -421 +430 @@
       'Online' => array('Type' => 'Boolean', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
       'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
+      'Links1' => array('Type' => 'TNetworkLinkListInterface1', 'Caption' => 'Propojení 1', 'Default' => ''),
+      'Links2' => array('Type' => 'TNetworkLinkListInterface2', 'Caption' => 'Propojení 2', 'Default' => ''),
     ),
   ),
@@ -767 +778 @@
     'Type' => 'Reference',
     'Table' => 'NetworkInterface',
-    'Id' => 'Id',
-    'Name' => 'Name',
+    'View' => '(SELECT NetworkInterface.*, CONCAT(NetworkDevice.Name, "-", NetworkInterface.Name) AS DeviceName FROM NetworkInterface '.
+      'LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device) AS T',      
+    'Id' => 'Id',
+    'Name' => 'DeviceName',
     'Filter' => '1',
   ),
@@ -1021 +1034 @@
     'Id' => 'Id',
     'Ref' => 'Category',
+    'Filter' => '1',
+  ),
+  'TNetworkLinkListInterface1' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkLink',
+    'Id' => 'Id',
+    'Ref' => 'Interface1',
+    'Filter' => '1',
+  ),
+  'TNetworkLinkListInterface2' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkLink',
+    'Id' => 'Id',
+    'Ref' => 'Interface2',
     'Filter' => '1',
   ),