diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index 16b505f..4e2a498 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -57,9 +57,9 @@ class DatasetTambahanController extends Controller public function grid(Request $request) { if(session('group_id') == 1){ - $data = DatasetTambahan::orderBy('DatasetId','DESC')->get(); + $data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->get(); }else{ - $data = DatasetTambahan::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); + $data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); } // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; @@ -73,15 +73,15 @@ class DatasetTambahanController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '
'; if($row->created_by == auth()->user()->id){ - $action .= ''; + $action .= ''; } - $action .= ''; + $action .= ''; if(session('group_id') == 1){ // $action .= ''; if($row->status == 1){ - $action .= ''; + $action .= ''; }else{ - $action .= ''; + $action .= ''; } } $action .= '
';