deon/photo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated photo viewing

Browse Source
This commit is contained in:
Deon George
2019-12-14 22:29:54 +11:00
parent 8f093f50b7
commit ebfdf3f7d5
10 changed files with 232 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Auth/LoginController.php
View File

@@ -42,6 +42,11 @@ class LoginController extends Controller
*/
public function showLoginForm()
{
return view('adminlte::auth.login');
$login_note = '';
if (file_exists('login_note.txt'))
$login_note = file_get_contents('login_note.txt');
return view('adminlte::auth.login')->with('login_note',$login_note);
}
}

8
app/Http/Controllers/PhotoController.php
View File

@@ -54,7 +54,7 @@ class PhotoController extends Controller
{
return view('catalog.duplicatereview',[
'return'=>url('/p/duplicates'),
'catalog'=>is_null($id) ? Photo::notRemove()->where('duplicate',1)->paginate(50) : Photo::where('id',$id)->paginate(1)
'catalog'=>is_null($id) ? Photo::notRemove()->where('duplicate',1)->with('software.model.make')->paginate(10) : Photo::where('id',$id)->paginate(1)
]);
}
@@ -73,15 +73,15 @@ class PhotoController extends Controller
// Set if delete
$po->remove = $request->input('remove.'.$id) ? 1 : NULL;
$po->isDirty() AND $po->save();
$po->save();
}
return redirect()->action('PhotoController@duplicates','?page='.$request->input('page'));
}
public function info($id)
public function info(Photo $o)
{
return view('photo.view', ['photo'=> Photo::findOrFail($id)]);
return view('photo.view',['o'=>$o]);
}
public function thumbnail($id)