diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 785c79b..7d6ab91 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) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$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) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$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) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$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) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$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) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$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) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$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 3735175..46a94ae 100644
--- a/app/Http/Controllers/Management/UserController.php
+++ b/app/Http/Controllers/Management/UserController.php
@@ -53,7 +53,7 @@ class UserController extends Controller
if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
$action .= '
';
$action .= '
';
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$action .= '
';
$action .= '
';
}
diff --git a/app/Http/Controllers/Master/InstansiController.php b/app/Http/Controllers/Master/InstansiController.php
index 4f66d7c..76b65f3 100644
--- a/app/Http/Controllers/Master/InstansiController.php
+++ b/app/Http/Controllers/Master/InstansiController.php
@@ -53,7 +53,7 @@ class InstansiController extends Controller
if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
$action .= '
';
$action .= '
';
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
// $action .= '
';
$action .= '
';
}
diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php
index 18950b8..8a5cffe 100644
--- a/app/Http/Controllers/Opendata/DatasetController.php
+++ b/app/Http/Controllers/Opendata/DatasetController.php
@@ -59,7 +59,7 @@ class DatasetController extends Controller
public function grid(Request $request)
{
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$data = Dataset::with(['template'])->orderBy('DatasetId','DESC')->get();
}else{
$data = Dataset::with(['template'])->orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get();
@@ -79,7 +79,7 @@ class DatasetController extends Controller
$action .= '
';
}
$action .= '
';
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
// $action .= '
';
if($row->status == 1){
$action .= '
';
@@ -210,7 +210,7 @@ class DatasetController extends Controller
$data['route'] = $this->route;
$data['keyId'] = $id;
$data['item'] = Dataset::find($keyId);
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$data['instansi'] = Instansi::all();
}else{
$data['instansi'] = Instansi::where('MsInstansiId',session('instansi_id'))->get();
diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php
index d752ca6..5a76e0e 100644
--- a/app/Http/Controllers/Opendata/DatasetTambahanController.php
+++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php
@@ -56,7 +56,7 @@ class DatasetTambahanController extends Controller
public function grid(Request $request)
{
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->get();
}else{
$data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get();
@@ -76,7 +76,7 @@ class DatasetTambahanController extends Controller
$action .= '
';
}
$action .= '
';
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
// $action .= '
';
if($row->status == 1){
$action .= '
';
@@ -280,7 +280,7 @@ class DatasetTambahanController extends Controller
$data['route'] = $this->route;
$data['keyId'] = $id;
$data['item'] = DatasetTambahan::find($keyId);
- if((session('group_id') == 1) || (session('group_id') == 9)){
+ if((session('group_id') == 1) || (session('group_alias') == 'admin')){
$data['instansi'] = Instansi::all();
}else{
$data['instansi'] = Instansi::where('MsInstansiId',session('instansi_id'))->get();