krzysiej/paper-pi
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'issue-57' of krzysiej/paper-pi into master

Browse Source
This commit was merged in pull request #64.
This commit is contained in:
krzysiej
2018-10-04 22:41:06 +02:00
committed by krzysiej
parent b052fa50db d08bdc0893
commit 817b573258
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Main.php
View File

@@ -202,7 +202,7 @@ class Main extends Controller
* @param $slug * @param $slug
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/ */
public function edit(Request $request, $id, $slug) public function edit(Request $request, $id, $slug = null)
{ {
$note = DB::table('note')->where('id', $id)->first(); $note = DB::table('note')->where('id', $id)->first();
if ($request->isMethod('post')) { if ($request->isMethod('post')) {

4
routes/web.php
View File

@@ -16,9 +16,9 @@ Route::get('/filter/{icon?}', 'Main@filterView');
Route::get('/settings', 'Settings@mainView')->name('settingsList'); Route::get('/settings', 'Settings@mainView')->name('settingsList');
Route::post('/settings', 'Settings@save'); Route::post('/settings', 'Settings@save');
//Route::post('/', 'Main@listView'); //Route::post('/', 'Main@listView');
Route::get('/edit/{id}/{slug}', 'Main@edit')->name('edit'); Route::get('/edit/{id}/{slug?}', 'Main@edit')->name('edit');
Route::post('/print/{id}/', 'Main@printText')->name('print'); Route::post('/print/{id}/', 'Main@printText')->name('print');
Route::post('/edit/{id}/{slug}', 'Main@edit'); Route::post('/edit/{id}/{slug?}', 'Main@edit');
Route::post('/printImage', 'Main@imagePrint'); Route::post('/printImage', 'Main@imagePrint');