diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 55e8764..785c79b 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -29,14 +29,14 @@ class HomeController extends Controller public function dashboard() { $data['title'] = 'Dashboard'; - if(session('group_id') == 1){ + if((session('group_id') == 1) || (session('group_id') == 9)){ $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); }else{ $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->limit(10)->get(); } // $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); $data['group'] = Group::where('MsGroupId','!=',1)->where('name','!=','Balai')->get(); - if(session('group_id') == 1){ + if((session('group_id') == 1) || (session('group_id') == 9)){ $data['resource'] = Template::with(['dataset'])->where('show_dashboard',1)->get(); }else{ $data['resource'] = Template::with(['dataset'])->whereHas('dataset',function($query){ @@ -60,7 +60,7 @@ class HomeController extends Controller public function grid(Request $request) { - if(session('group_id') == 1){ + if((session('group_id') == 1) || (session('group_id') == 9)){ $data = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); }else{ $data = Dataset::orderBy('DatasetId','DESC')->limit(10)->whereIn('created_by',[auth()->user()->id,1])->get(); @@ -103,7 +103,7 @@ class HomeController extends Controller public function gridResource(Request $request) { - if(session('group_id') == 1){ + if((session('group_id') == 1) || (session('group_id') == 9)){ $data = Template::with(['dataset'])->where('show_dashboard',1)->get(); }else{ $data = Template::with(['dataset'])->whereHas('dataset',function($query){ @@ -116,7 +116,7 @@ class HomeController extends Controller foreach ($data as $key => $row) { $action = ''; - if(session('group_id') == 1){ + if((session('group_id') == 1) || (session('group_id') == 9)){ $action .= 'Lihat Data'; }else{ $action .= 'Lihat Data'; @@ -139,7 +139,7 @@ class HomeController extends Controller public function datasetGrid($alias,Request $request) { - if(session('group_id') == 1){ + if((session('group_id') == 1) || (session('group_id') == 9)){ $data = Dataset::whereHas('instansi',function($query) use ($alias){ $query->where('parent','ilike','%'.$alias.'%'); })->orderBy('DatasetId','DESC')->get(); diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php index 80b128e..f92e540 100644 --- a/app/Http/Controllers/Management/UserController.php +++ b/app/Http/Controllers/Management/UserController.php @@ -50,7 +50,7 @@ class UserController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '