Merge pull request #2485 from Leantime/hideCompanyMenuPoint

Hide company menu point
Leantime · Apr 23, 2024 · 4852130 · 4852130
2 parents 2c12131 + 9569a1a
commit 4852130
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Version: 3.1.1
 
+* [c1cfd20](https://github.com/Leantime/leantime/commit/c1cfd200349679b17f98f2a62a9054fa639b800b): [Changelog CI] Add Changelog for Version 3.1.1
+* [c73e858](https://github.com/Leantime/leantime/commit/c73e8586f8d5d16cd0db0571e21a4cf03045042c): fix: upgrade @sentry/browser from 7.108.0 to 7.109.0
+
+Snyk has created this PR to upgrade @sentry/browser from 7.108.0 to 7.109.0.
+
+See this package in npm:
+https://www.npmjs.com/package/@sentry/browser
+
+See this project in Snyk:
+https://app.snyk.io/org/broskees/project/c3e7f2a0-597b-4965-a7cf-7e6ea71043ae?utm_source=github&utm_medium=referral&page=upgrade-pr
+
 * [9e4ca51](https://github.com/Leantime/leantime/commit/9e4ca514b4292187f7c9dde8bd386a1c3f15c0cb): Update release.yml
 
 Include new changelog generator

diff --git a/app/Domain/Menu/Templates/headMenu.blade.php b/app/Domain/Menu/Templates/headMenu.blade.php
@@ -164,7 +164,7 @@ class="active"
             data-tippy-content="{{ __('popover.my_work') }}"
         >{!! __('menu.my_work') !!}</a>
     </li>
-    @if ($login::userIsAtLeast("manager"))
+    @if ($login::userIsAtLeast("manager", true))
         <li>
             <a
                 href="{{ BASE_URL }}/setting/editCompanySettings/"

diff --git a/app/Domain/Plugins/Controllers/Details.php b/app/Domain/Plugins/Controllers/Details.php
@@ -3,6 +3,8 @@
 namespace Leantime\Domain\Plugins\Controllers;
 
 use Leantime\Core\Controller;
+use Leantime\Domain\Auth\Models\Roles;
+use Leantime\Domain\Auth\Services\Auth;
 use Leantime\Domain\Plugins\Services\Plugins as PluginService;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -27,6 +29,9 @@ public function init(PluginService $pluginService): void
      */
     public function get(): Response
     {
+
+        Auth::authOrRedirect([Roles::$owner, Roles::$admin], true);
+
         if (! $this->incomingRequest->query->has('id')) {
             throw new \Exception('Plugin Identifier is required');
         }

diff --git a/app/Domain/Plugins/Controllers/Marketplace.php b/app/Domain/Plugins/Controllers/Marketplace.php
@@ -3,6 +3,8 @@
 namespace Leantime\Domain\Plugins\Controllers;
 
 use Leantime\Core\Controller;
+use Leantime\Domain\Auth\Models\Roles;
+use Leantime\Domain\Auth\Services\Auth;
 use Leantime\Domain\Plugins\Services\Plugins as PluginService;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -27,6 +29,9 @@ public function init(
      */
     public function get(): Response
     {
+
+        Auth::authOrRedirect([Roles::$owner, Roles::$admin], true);
+
         $this->tpl->assign('plugins', []);
 
         return $this->tpl->display('plugins.marketplace');

diff --git a/app/Domain/Plugins/Controllers/Myapps.php b/app/Domain/Plugins/Controllers/Myapps.php
@@ -23,7 +23,7 @@ class Myapps extends Controller
          */
         public function init(PluginService $pluginService): void
         {
-            Auth::authOrRedirect([Roles::$owner, Roles::$admin]);
+            Auth::authOrRedirect([Roles::$owner, Roles::$admin], true);
             $this->pluginService = $pluginService;
         }