Updates to duplicate/remove displays, remove deprecated display functions

This commit is contained in:
2024-09-30 22:56:08 +10:00
parent 7eb0379996
commit 7742b4289d
13 changed files with 103 additions and 117 deletions

View File

@@ -17,6 +17,9 @@ trait Multimedia
{
use Type;
protected const list_duplicates = 20;
protected const list_deletes = 50;
private function controller(string $type): string
{
switch (strtolower($type)) {
@@ -31,10 +34,11 @@ trait Multimedia
$class = $this->getModelType($request->input('type'));
$this->updatePostItems($request,$class,TRUE);
return redirect()->action(
sprintf('%s@deletes',$this->controller($request->input('type'))),
sprintf('?page=%s',$request->input('page'))
);
return redirect()
->action(
sprintf('%s@deletes',$this->controller($request->input('type'))),
sprintf('?page=%s',$request->input('page'))
);
}
public function duplicatesUpdate(Request $request)
@@ -42,10 +46,11 @@ trait Multimedia
$class = $this->getModelType($request->input('type'));
$this->updatePostItems($request,$class);
return redirect()->action(
sprintf('%s@duplicates',$this->controller($request->input('type'))),
sprintf('?page=%s',$request->input('page'))
);
return redirect()
->action(
sprintf('%s@duplicates',$this->controller($request->input('type'))),
sprintf('?page=%s',$request->input('page'))
);
}
private function updatePostItems(Request $request,string $class,bool $delete=FALSE)
@@ -53,9 +58,11 @@ trait Multimedia
foreach ($request->input('items') as $id) {
try {
$o = $class::findOrFail($id);
} catch (ModelNotFoundException $e) {
Log::alert('Object not found: '.$id);
continue;
} catch (\Exception $e) {
dd($e);
}
@@ -70,7 +77,7 @@ trait Multimedia
$o->flag = $request->input('flag.'.$id) ? 1 : NULL;
// Set if delete
if ($delete AND $o->remove AND ($request->input('remove.'.$id) ? 1 : NULL)) {
if ($delete && $o->remove && ($request->input('remove.'.$id) ? 1 : NULL)) {
switch (strtolower($request->input('type'))) {
case 'photo':
$this->dispatch((new PhotoDelete($o))->onQueue('delete'));