From 24c3f2999ecbf1baa983d7d3184287d4aa915a58 Mon Sep 17 00:00:00 2001 From: Hamatoma Date: Sat, 29 Mar 2025 21:41:37 +0100 Subject: [PATCH] V0.1.6 ProcessController MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - ProcessController: destroy(): Löschen der Dateien xmlfile und image --- CHANGELOG.md | 4 ++++ app/Http/Controllers/ProcessController.php | 8 +++++++- resources/views/process/edit.blade.php | 11 +++-------- resources/views/process/show.blade.php | 10 ++++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aee7c8..2bf302e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Änderungen an zentrum +# V0.1.6 ProcessController + +- ProcessController: destroy(): Löschen der Dateien xmlfile und image + # V0.1.5 ProcessController - ProcessController: diff --git a/app/Http/Controllers/ProcessController.php b/app/Http/Controllers/ProcessController.php index d446ae9..c443cc8 100644 --- a/app/Http/Controllers/ProcessController.php +++ b/app/Http/Controllers/ProcessController.php @@ -75,7 +75,7 @@ class ProcessController extends Controller ]; } $fields['referenceXml'] = FileHelper::urlUpload() . '/' . $process->xmlfile; - $fields['referenceImage'] = $process->image == null ? '#' : FileHelper::urlUpload() . '/' . $process->image; + $fields['referenceImage'] = $process->image == null ? '' : FileHelper::urlUpload() . '/' . $process->image; $context = new ContextLaraKnife($request, $fields, $process); $optionsDivision = SProperty::optionsByScope('division', $process->division_scope, ''); $optionsActivity = SProperty::optionsByScope('activity', $process->activity_scope, ''); @@ -95,6 +95,10 @@ class ProcessController extends Controller public function destroy(Process $process, Request $request) { if ($request->btnSubmit === 'btnDelete') { + unlink(FileHelper::pathUpload($process->xmlfile)); + if ($process->image != null) { + unlink(FileHelper::pathUpload($process->image)); + } $process->delete(); } return redirect('/process-index'); @@ -250,6 +254,8 @@ LEFT JOIN users t3 ON t3.id=t0.owner_id $optionsDivision = SProperty::optionsByScope('division', $process->division_scope, ''); $optionsActivity = SProperty::optionsByScope('activity', $process->activity_scope, ''); $optionsOwner = DbHelper::comboboxDataOfTable('users', 'name', 'id', $process->owner_id, '-'); + $fields['referenceXml'] = FileHelper::urlUpload() . '/' . $process->xmlfile; + $fields['referenceImage'] = $process->image == null ? '' : FileHelper::urlUpload() . '/' . $process->image; $context = new ContextLaraKnife($request, null, $process); $rc = view('process.show', [ 'context' => $context, diff --git a/resources/views/process/edit.blade.php b/resources/views/process/edit.blade.php index 99ed052..8f0d60f 100644 --- a/resources/views/process/edit.blade.php +++ b/resources/views/process/edit.blade.php @@ -29,14 +29,9 @@ - @if ($context->valueOf('image') != null) - - @else - - @endif + diff --git a/resources/views/process/show.blade.php b/resources/views/process/show.blade.php index 64f957a..8d70b5e 100644 --- a/resources/views/process/show.blade.php +++ b/resources/views/process/show.blade.php @@ -31,10 +31,12 @@ value="{{ $context->valueOf('datasources') }}" width2="4" attribute="readonly" rows="4" /> - - + + @endsection -- 2.39.5