From b30b5e4fce81bad94cc5899d55d9c89dc7b96857 Mon Sep 17 00:00:00 2001
From: Cliff Jonathan <cliffsantoso@gmail.com>
Date: Tue, 17 May 2016 16:13:13 +0700
Subject: [PATCH] Fix institusi
---
.../Http/Controllers/InstitusiController.php | 20 +++++++++----------
.../Controllers/PendinFormalController.php | 1 +
ppl2/app/Http/routes.php | 2 +-
ppl2/resources/views/editInstitusi.blade.php | 2 +-
ppl2/resources/views/institusi.blade.php | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ppl2/app/Http/Controllers/InstitusiController.php b/ppl2/app/Http/Controllers/InstitusiController.php
index 618136a..92c2d51 100644
--- a/ppl2/app/Http/Controllers/InstitusiController.php
+++ b/ppl2/app/Http/Controllers/InstitusiController.php
@@ -76,7 +76,7 @@ class InstitusiController extends Controller
// redirect
Session::flash('message', 'Successfully created institusi!');
- return Redirect::to('daftarinstitusi');
+ return \Redirect::to('daftarinstitusi');
}
}
@@ -89,8 +89,8 @@ class InstitusiController extends Controller
public function show($id)
{
//
- $institusi = Institusi::where('institusi_id',$id)->get();
- return view('institusi',compact('institusi','institusi_id'));
+ $institusi = Institusi::where('id',$id)->get();
+ return view('institusi',compact('institusi','id'));
}
/**
@@ -117,14 +117,14 @@ class InstitusiController extends Controller
//
$institusi = Institusi::find($id);
- $institusi->nama_institusi = $request->input('nama_institusi');
- $institusi->alamat_institusi = $request->input('alamat_institusi');
- $institusi->email_institusi = $request->input('email_institusi');
- $institusi->notelp_institusi = $request->input('notelp_institusi');
+ $institusi->nama_institusi = $request->input('name');
+ $institusi->alamat_institusi = $request->input('alamat');
+ $institusi->email_institusi = $request->input('email');
+ $institusi->notelp_institusi = $request->input('notelp');
$institusi->save();
Session::flash('message', 'Institusi successfully updated');
- return Redirect::to('daftarinstitusi');
+ return \Redirect::to('daftarinstitusi');
}
/**
@@ -139,11 +139,11 @@ class InstitusiController extends Controller
$institusi = Institusi::find($id);
$institusi->delete();
Session::flash('message', 'Institusi berhasil dihapus');
- return Redirect::to('daftarinstitusi');
+ return \Redirect::to('daftarinstitusi');
}
public function search(Request $request) {
$res = $request->input('query');
- return Redirect::to('daftarinstitusi/'.$res);
+ return \Redirect::to('daftarinstitusi/all/'.$res);
}
}
diff --git a/ppl2/app/Http/Controllers/PendinFormalController.php b/ppl2/app/Http/Controllers/PendinFormalController.php
index 8c2ce6a..97b8582 100644
--- a/ppl2/app/Http/Controllers/PendinFormalController.php
+++ b/ppl2/app/Http/Controllers/PendinFormalController.php
@@ -68,6 +68,7 @@ class PendinFormalController extends Controller
public function search(Request $request) {
$res = $request->input('query');
+ error_log("asdfafdasf");
return \Redirect::to('pendidikan-informal/all/'.$res);
}
}
diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php
index c8f7130..50042c0 100644
--- a/ppl2/app/Http/routes.php
+++ b/ppl2/app/Http/routes.php
@@ -93,7 +93,7 @@ Route::get('daftarinstitusi/{id}/edit','InstitusiController@edit');
Route::get('daftarinstitusi/{id}/delete','InstitusiController@destroy');
-Route::get('daftarinstitusi/{id}','InstitusiController@show');
+Route::get('daftarinstitusi/all/{id}','InstitusiController@show');
Route::get('daftarinstitusi/search','InstitusiController@search');
diff --git a/ppl2/resources/views/editInstitusi.blade.php b/ppl2/resources/views/editInstitusi.blade.php
index 0844f34..a681a50 100644
--- a/ppl2/resources/views/editInstitusi.blade.php
+++ b/ppl2/resources/views/editInstitusi.blade.php
@@ -24,7 +24,7 @@
<div class="panel panel-default">
<div class="panel-heading font-bold">Form Institusi</div>
<div class="panel-body">
- <form class="bs-example form-horizontal" method="POST" action="{{ URL::to('/')}}/daftarinstitusi/{{$institusi->institusi_id}}/update">
+ <form class="bs-example form-horizontal" method="POST" action="{{ URL::to('/')}}/daftarinstitusi/{{$institusi->id}}/update">
<div class="form-group">
<label class="col-lg-2 control-label">Nama</label>
diff --git a/ppl2/resources/views/institusi.blade.php b/ppl2/resources/views/institusi.blade.php
index b0dc068..c6658f8 100644
--- a/ppl2/resources/views/institusi.blade.php
+++ b/ppl2/resources/views/institusi.blade.php
@@ -56,7 +56,7 @@
<tbody>
@foreach($institusi as $key => $value)
<tr data-expanded="true">
- <td>{{ $value->institusi_id }}</td>
+ <td>{{ $value->id }}</td>
<td>{{ $value->nama_institusi }}</td>
<td>{{ $value->alamat_institusi }}</td>
<td>{{ $value->email_institusi }}</td>
--
GitLab