Changeset 920 for trunk

Timestamp:

Feb 23, 2022, 11:27:58 PM (3 years ago)

Author:

chronos

Message:

• Modified: Do not show All tabs if only one tab is used in IS item relation tabs.
• Modified: Do not show tabs at all if no relations are used for IS item.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Types/String.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (1 diff)
• Packages/Common/NetworkAddress.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 917; // Subversion revision
+$Revision = 920; // Subversion revision
 $DatabaseRevision = 911; // SQL structure revision
 $ReleaseTime = strtotime('2022-02-23');

trunk/Common/Form/Types/String.php

@@ -25 +25 @@
   function OnLoad(array $Item): ?string
   {
-    //echo($Item['Name'].'='.$_POST[$Item['Name']].','.is_null(NULL).'<br>');
     return $_POST[$Item['Name']];
   }

trunk/Modules/IS/IS.php

@@ -514 +514 @@
     $Tabs = array();
     foreach ($Form->Definition['Items'] as $Index => $Item)
-    if ((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
-    ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
-    {
-      $Tabs[] = $Item['Caption'];
-    }
-    $Tabs[] = 'Vše';
-    if (array_key_exists('tab', $_GET)) $TabIndex = $_GET['tab'];
-      else $TabIndex = 0;
-
-    $TabContent = '';
-    $I = 0;
-    foreach ($Form->Definition['Items'] as $Index => $Item)
-    if ((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
-    ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
-    {
-      $TypeItem = $this->System->FormManager->FormTypes[$Item['Type']];
-      if (($TabIndex == $I) or ($TabIndex == (count($Tabs) - 1)))
-      {
-        if ($TypeItem['Ref'] == null)
-        {
-          $Filter = $TypeItem['Filter'];
-          $Filter = str_replace('#Id', $Id, $Filter);
-          $TabContent .= $this->ShowList($TypeItem['Table'],
-            $Filter, $Item['Caption']).'<br/>';
-        } else $TabContent .= $this->ShowList($TypeItem['Table'], '`'.
-          $TypeItem['Ref'].'`='.$Id, $Item['Caption'],
-          $TypeItem['Ref'], $Id).'<br/>';
-      }
-      $I++;
-    }
-
-    $Output .= $this->ShowTabs($Tabs, 'tab', $TabContent);
+    {
+      if ((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
+      ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
+      {
+        $Tabs[] = $Item['Caption'];
+      }
+    }
+    if (count($Tabs) > 0)
+    {
+      if (count($Tabs) > 1)
+      {
+        $Tabs[] = 'Vše';
+      }
+      if (array_key_exists('tab', $_GET))
+      {
+        $TabIndex = $_GET['tab'];
+        if (($TabIndex < 0) or ($TabIndex >= count($Tabs)))
+        {
+          $TabIndex = 0;
+        }
+      } else $TabIndex = 0;
+
+      $TabContent = '';
+      $I = 0;
+      foreach ($Form->Definition['Items'] as $Index => $Item)
+      if ((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
+      ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
+      {
+        $TypeItem = $this->System->FormManager->FormTypes[$Item['Type']];
+        if (($TabIndex == $I) or ((count($Tabs) > 1) and ($TabIndex == (count($Tabs) - 1))))
+        {
+          if ($TypeItem['Ref'] == null)
+          {
+            $Filter = $TypeItem['Filter'];
+            $Filter = str_replace('#Id', $Id, $Filter);
+            $TabContent .= $this->ShowList($TypeItem['Table'],
+              $Filter, $Item['Caption']).'<br/>';
+          } else $TabContent .= $this->ShowList($TypeItem['Table'], '`'.
+            $TypeItem['Ref'].'`='.$Id, $Item['Caption'],
+            $TypeItem['Ref'], $Id).'<br/>';
+        }
+        $I++;
+      }
+
+      $Output .= $this->ShowTabs($Tabs, 'tab', $TabContent);
+    }
     return $Output;
   }

trunk/Packages/Common/NetworkAddress.php

@@ -102 +102 @@
     foreach ($Data as $Item)
     {
-
       $Result[] = dechex($Item & 15);
       $Result[] = dechex(($Item >> 4) & 15);