Merge pull request #16837 from grokability/fmcs_scoping_improvements

Small improvements to scoped views

app/Http/Controllers/Api/ReportsController.php

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Models\Actionlog;
+use App\Models\Company;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -18,10 +20,11 @@ class ReportsController extends Controller
      */
     public function index(Request $request) : JsonResponse | array
     {
-        $this->authorize('reports.view');
+        $this->authorize('activity.view');
 
         $actionlogs = Actionlog::with('item', 'user', 'adminuser', 'target', 'location');
 
+
         if ($request->filled('search')) {
             $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
         }

app/Presenters/LocationPresenter.php

@@ -33,7 +33,7 @@ class LocationPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.company'),
                 'visible' => false,
-                'formatter' => 'locationCompanyObjFilterFormatter'
+                'formatter' => 'companiesLinkObjFormatter'
             ],
             [
                 'field' => 'name',

app/Providers/AuthServiceProvider.php

@@ -168,6 +168,15 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // -----------------------------------------
+        // Activity
+        // -----------------------------------------
+        Gate::define('activity.view', function ($user) {
+            if (($user->hasAccess('reports.view')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
         // -----------------------------------------
         // Self
         // -----------------------------------------

resources/views/dashboard.blade.php

@@ -292,7 +292,7 @@
 <div class="row">
     <div class="col-md-6">
 
-		@if ($snipeSettings->full_multiple_companies_support=='1')
+		@if ((($snipeSettings->scope_locations_fmcs!='1') && ($snipeSettings->full_multiple_companies_support=='1')))
 			 <!-- Companies -->	
 			<div class="box box-default">
 				<div class="box-header with-border">