Do not display Log tab if user do not have right to see logs

glpi-project · Nov 15, 2023 · 0fed4fa · 0fed4fa
1 parent 3a492b4
commit 0fed4fa
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 12 deletions.
diff --git a/src/Log.php b/src/Log.php
@@ -87,6 +87,9 @@ public static function getTypeName($nb = 0)
 
     public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
     {
+        if (!self::canView()) {
+            return '';
+        }
 
         $nb = 0;
         if ($_SESSION['glpishow_count_on_tabs']) {
@@ -299,6 +302,10 @@ public static function showForItem(CommonDBTM $item, $withtemplate = 0)
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
 
+        if (!self::canView()) {
+            return;
+        }
+
         $itemtype = $item->getType();
         $items_id = $item->getField('id');
 

diff --git a/tests/LDAP/AuthLdap.php b/tests/LDAP/AuthLdap.php
@@ -256,8 +256,8 @@ public function testDefineTabs()
     {
         $ldap     = new \AuthLDAP();
         $tabs     = $ldap->defineTabs();
-        $expected = ['AuthLDAP$main' => 'LDAP directory',
-            'Log$1'         => 'Historical'
+        $expected = [
+            'AuthLDAP$main' => 'LDAP directory',
         ];
         $this->array($tabs)->isIdenticalTo($expected);
     }

diff --git a/tests/functional/Agent.php b/tests/functional/Agent.php
@@ -46,7 +46,6 @@ public function testDefineTabs()
         $expected = [
             'Agent$main'        => 'Agent',
             'RuleMatchedLog$0'  => 'Import information',
-            'Log$1'             => 'Historical'
         ];
         $this
          ->given($this->newTestedInstance)

diff --git a/tests/functional/Appliance.php b/tests/functional/Appliance.php
@@ -45,7 +45,6 @@ public function testDefineTabs()
             'Appliance$main'     => 'Appliance',
             'Impact$1'           => 'Impact analysis',
             'ManualLink$1'       => 'Links',
-            'Log$1'              => 'Historical',
         ];
         $this
          ->given($this->newTestedInstance)

diff --git a/tests/functional/Config.php b/tests/functional/Config.php
@@ -95,7 +95,6 @@ public function testDefineTabs()
             'Config$4'      => 'Assistance',
             'Config$12'     => 'Management',
             'GLPINetwork$1' => 'GLPI Network',
-            'Log$1'         => 'Historical',
         ];
         $this
          ->given($this->newTestedInstance)

diff --git a/tests/functional/Document.php b/tests/functional/Document.php
@@ -96,8 +96,6 @@ public function testDefineTabs()
             'Document$main'   => 'Document',
             'Document_Item$1' => 'Associated items',
             'Document_Item$2' => 'Documents',
-            'Log$1'           => 'Historical'
-
         ];
         $this
          ->given($this->newTestedInstance)

diff --git a/tests/functional/OperatingSystem.php b/tests/functional/OperatingSystem.php
@@ -60,7 +60,6 @@ protected function getTabs()
     {
         return [
             'OperatingSystem$main'  => 'Operating system',
-            'Log$1'                 => 'Historical'
         ];
     }
 

diff --git a/tests/functional/OperatingSystemArchitecture.php b/tests/functional/OperatingSystemArchitecture.php
@@ -60,7 +60,6 @@ protected function getTabs()
     {
         return [
             'OperatingSystemArchitecture$main'  => 'Operating system architecture',
-            'Log$1'                             => 'Historical'
         ];
     }
 

diff --git a/tests/functional/OperatingSystemEdition.php b/tests/functional/OperatingSystemEdition.php
@@ -68,7 +68,6 @@ protected function getTabs()
     {
         return [
             'OperatingSystemEdition$main' => 'Edition',
-            'Log$1'                       => 'Historical'
         ];
     }
 

diff --git a/tests/functional/OperatingSystemKernel.php b/tests/functional/OperatingSystemKernel.php
@@ -60,7 +60,6 @@ protected function getTabs()
     {
         return [
             'OperatingSystemKernel$main'  => 'Kernel',
-            'Log$1'                       => 'Historical'
         ];
     }
 

diff --git a/tests/functional/OperatingSystemKernelVersion.php b/tests/functional/OperatingSystemKernelVersion.php
@@ -75,7 +75,6 @@ protected function getTabs()
     {
         return [
             'OperatingSystemKernelVersion$main' => 'Kernel version',
-            'Log$1'                             => 'Historical'
         ];
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,6 @@ protected function getTabs() @@
         {
             return [
                 'OperatingSystem$main'  => 'Operating system',
-                'Log$1'                 => 'Historical'
             ];
         }
@@ Expand Down @@