Changeset 597 for trunk/Modules

Timestamp:

Nov 22, 2013, 10:37:47 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Akce zobrazovat přes sjednocenou funkci ShowAction.
• Přidáno: Chybějící tabulka Model pro seznam modelů.

Location:

trunk/Modules

Files:

• IS/IS.php (modified) (2 diffs)
• Portal/Portal.php (modified) (1 diff)

trunk/Modules/IS/IS.php

@@ -484 +484 @@
         $LinkTitle = MakeLink($MenuItem['URL'], $LinkTitle);
       }
-      if($MenuItem['IconName'] != '') $Image = '<img src="../images/favicons/'.$MenuItem['IconName'].'"/>&nbsp;';
-        else $Image = '<img src="../images/favicons/blank.png"/>&nbsp;';
-      $Output .= '<li>'.$Image.$LinkTitle.'</li>';
+      if($MenuItem['IconName'] != '') $Image = '<img src="'.$this->System->Link('/images/favicons/'.$MenuItem['IconName']).'"/>&nbsp;';
+        else $Image = '<img src="'.$this->System->Link('/images/favicons/blank.png').'"/>&nbsp;';
+      if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))       
+        $Output .= '<li>'.$Image.$LinkTitle.'</li>';
       $Output .= $this->ShowMenuItem($MenuItem['Id']);
     }
@@ -495 +496 @@
   function TableToModule($Table)
   {
-    $DbResult = $this->Database->query('SELECT (SELECT Name FROM Module WHERE Module.Id=Model.Module) AS Name FROM Model WHERE Name="'.$Table.'"');
+    $DbResult = $this->Database->query('SELECT (SELECT `Name` FROM `Module` '.
+      'WHERE `Module`.`Id`=`Model`.`Module`) AS `Name` FROM `Model` WHERE `Name`="'.$Table.'"');
     if($DbResult->num_rows == 1)
     {

trunk/Modules/Portal/Portal.php

@@ -103 +103 @@
   function ShowActions($ActionGroup)
   {
-    $Output = '';
-    $DbResult = $this->Database->query('SELECT *, `ActionIcon`.`Name` AS `Icon` FROM `Action` '.
-      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
-      'WHERE (`Group`='.$ActionGroup['Id'].') AND (`Enable` = 1)');
+    $Output = '';    
+    $DbResult = $this->Database->query('SELECT `Id` FROM `Action` '.      
+      'WHERE (`Action`.`Group`='.$ActionGroup['Id'].') AND (`Action`.`Enable` = 1)');
     while($Action = $DbResult->fetch_assoc())
     {
-      if($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
-        if(substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->System->Link($Action['URL']);
-        if($Action['PermissionOperation'] != '') 
-        {
-          $DbResult2 = $this->Database->query('SELECT * FROM PermissionOperation'.
-            ' LEFT JOIN Module ON Module.Id=PermissionOperation.Module'.
-            ' WHERE Id='.$Action['PermissionOperation']);
-          $DbRow2 = $DbResult2->fetch_assoc();
-          if($this->System->User->User->CheckPermission($DbRow2['Module'], $DbRow2['Operation']))
-            $Allowed = true; else $Allowed = false;        
-        } else $Allowed = true;
-        if($Allowed)
-          $Output .= '<img alt="'.$Action['Title'].'" src="images/favicons/'.$Action['Icon'].'" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a><br />';
+        $Output .= $this->System->ShowAction($Action['Id']);
     }
     return($this->Panel($ActionGroup['Name'], $Output));