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

Timestamp:

Apr 21, 2013, 11:24:56 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Tabulka ISMenuItem přepracována na obecnější MenuItem odkazující se na Menu. Nově položky nabídky jsou vázány přímo na akce tabulku Action.

File:

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

trunk/Modules/IS/IS.php

@@ -15 +15 @@
       return('Nemáte oprávnění');
 
-    $DbResult = $this->Database->select('ISMenuItem', '*', '1 ORDER BY Parent,Name');
+    $DbResult = $this->Database->query('SELECT `MenuItem`.`Id`, `MenuItem`.`Name`, `MenuItem`.`Parent`, `Action`.`URL` AS `URL`, `ActionIcon`.`Name` AS `IconName`  FROM `MenuItem` '.
+      'LEFT JOIN `Action` ON `Action`.`Id` = `MenuItem`.`Action` '.
+      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
+      'ORDER BY `MenuItem`.`Parent`,`MenuItem`.`Name`');
     while($DbRow = $DbResult->fetch_assoc())
     {
@@ -260 +263 @@
     {
       $LinkTitle = $MenuItem['Name'];
-      if($MenuItem['Table'] != '') $LinkTitle = MakeLink('?t='.$MenuItem['Table'].'&a=list', $LinkTitle);
+      if($MenuItem['URL'] != '') 
+      {
+        if(substr($MenuItem['URL'], 0, 4) != 'http') $MenuItem['URL'] = $this->System->Link($MenuItem['URL']);
+        $LinkTitle = MakeLink($MenuItem['URL'], $LinkTitle);
+      }
       if($MenuItem['IconName'] != '') $Image = '<img src="../images/favicons/'.$MenuItem['IconName'].'"/>&nbsp;';
         else $Image = '';