Changeset 736 for trunk/Modules/IS/IS.php

Timestamp:

Apr 6, 2015, 11:08:10 PM (9 years ago)

Author:

chronos

Message:

• Modified: Merged NetworkLink Interface1 and Interface2 to single column in subtable of NetworkInterface.
• Added: Table NetworkLinkType.
• Fixed: Do not show symbol "-" if network interface doesn't have a name.

File:

• trunk/Modules/IS/IS.php (modified) (6 diffs)

trunk/Modules/IS/IS.php

@@ -353 +353 @@
     if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
-
+    
+    $FormClass = $this->System->FormManager->Classes[$Table];
+    if(array_key_exists('BaseTable', $FormClass)) $TableModify = $FormClass['BaseTable'];
+      else $TableModify = $Table;
+    
     $Form = new Form($this->System->FormManager);
     $Form->SetClass($Table);
@@ -363 +367 @@
     {
     $Actions = array(
-      $this->ShowAction('Upravit', '?a=edit&t='.$Table.'&i='.$Id,
+      $this->ShowAction('Upravit', '?a=edit&t='.$TableModify.'&i='.$Id,
         $this->System->Link('/images/edit.png')),
       $this->ShowAction('Seznam', '?a=list&t='.$Table,
@@ -369 +373 @@
       $this->ShowAction('Odstranit', '?a=delete&t='.$Table.'&i='.$Id,
         $this->System->Link('/images/delete.png'), 'Opravdu smazat položku?'),
-      $this->ShowAction('Přidat', '?a=add&t='.$Table,
+      $this->ShowAction('Přidat', '?a=add&t='.$TableModify,
         $this->System->Link('/images/add.png'))
     );
@@ -625 +629 @@
     if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
+    $FormClass = $this->System->FormManager->Classes[$Table];
+    if(array_key_exists('BaseTable', $FormClass)) $TableModify = $FormClass['BaseTable'];
+      else $TableModify = $Table;
+    
     $RowActions = '<a href="?a=view&amp;t='.$Table.'&amp;i=#RowId"><img alt="Ukázat" title="Ukázat" src="'.
       $this->System->Link('/images/view.png').'"/></a>'.
-      '<a href="?a=edit&amp;t='.$Table.'&amp;i=#RowId"><img alt="Upravit" title="Upravit" src="'.
+      '<a href="?a=edit&amp;t='.$TableModify.'&amp;i=#RowId"><img alt="Upravit" title="Upravit" src="'.
       $this->System->Link('/images/edit.png').'"/></a>'.
       '<a href="?a=delete&amp;t='.$Table.'&amp;i=#RowId"><img alt="Smazat" title="Smazat" src="'.
@@ -634 +642 @@
       $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
-    $this->ShortTitle .= ' - '.$FormClass['Title'];
+    if($ExcludeColumn == '') $this->ShortTitle .= ' - '.$FormClass['Title'];
     if(array_key_exists('ItemActions', $FormClass))
     {
@@ -646 +654 @@
     $Output .= '<div style="text-align: center;">'.$FormClass['Title'].'</div>';
     $Output .= '<ul class="ActionMenu">';
-    $Output .= '<li>'.$this->ShowAction('Přidat', '?a=add&amp;t='.$Table.'&amp;preset'.$ExcludeColumn.'='.$ExcludeValue, $this->System->Link('/images/add.png')).'</li>';
+    $Output .= '<li>'.$this->ShowAction('Přidat', '?a=add&amp;t='.$TableModify.'&amp;preset'.$ExcludeColumn.'='.$ExcludeValue, $this->System->Link('/images/add.png')).'</li>';
     $Output .= '<li>'.$this->ShowAction('Seznam', '?a=list&amp;t='.$Table, $this->System->Link('/images/list.png')).'</li>';
     $MI = 0;