From 08004d3c9d4c5e6045a5a18f97d992399ef9ec2d Mon Sep 17 00:00:00 2001 From: Hamatoma Date: Sat, 29 Mar 2025 12:40:56 +0100 Subject: [PATCH] V0.1.5 ProcessController - ProcessController: - Darstellung xlmfile/image als Links --- CHANGELOG.md | 5 +++++ app/Http/Controllers/ProcessController.php | 5 +++-- composer.lock | 2 +- resources/views/process/edit.blade.php | 15 +++++++++++---- resources/views/process/index.blade.php | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9aaebb..1aee7c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Änderungen an zentrum +# V0.1.5 ProcessController + +- ProcessController: + - Darstellung xlmfile/image als Links + # V0.1.4 Process - Process: neu: +xmlfile +image diff --git a/app/Http/Controllers/ProcessController.php b/app/Http/Controllers/ProcessController.php index ca9b30e..d446ae9 100644 --- a/app/Http/Controllers/ProcessController.php +++ b/app/Http/Controllers/ProcessController.php @@ -74,10 +74,12 @@ class ProcessController extends Controller 'image' => $process->image ]; } + $fields['referenceXml'] = FileHelper::urlUpload() . '/' . $process->xmlfile; + $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, ''); - $optionsOwner = DbHelper::comboboxDataOfTable('users', 'name', 'id', $fields['owner_id'], __('-')); + $optionsOwner = DbHelper::comboboxDataOfTable('users', 'name', 'id', $fields['owner_id'], '-'); $rc = view('process.edit', [ 'context' => $context, 'optionsDivision' => $optionsDivision, @@ -297,7 +299,6 @@ LEFT JOIN users t3 ON t3.id=t0.owner_id public function storeFile(Request $request): ?string { $rc = null; - $file = $request->file(); $file = $request->file('file'); if ($file != null) { $filename = substr($file->getClientOriginalName(), 0, 200); diff --git a/composer.lock b/composer.lock index 70b44cd..790c4a2 100644 --- a/composer.lock +++ b/composer.lock @@ -1060,7 +1060,7 @@ "dist": { "type": "path", "url": "../laraknife", - "reference": "31ee280aefb8164691f9d80d4f6e60e0338430e1" + "reference": "bcdc9636b6c2e9ecaa82cf5701434eebe91386a1" }, "require-dev": { "phpunit/phpunit": "11.0.x-dev" diff --git a/resources/views/process/edit.blade.php b/resources/views/process/edit.blade.php index 127c1ac..99ed052 100644 --- a/resources/views/process/edit.blade.php +++ b/resources/views/process/edit.blade.php @@ -26,10 +26,17 @@ value="{{ $context->valueOf('datasources') }}" width2="4" rows="4" attribute="readonly" /> - - + + @if ($context->valueOf('image') != null) + + @else + + @endif diff --git a/resources/views/process/index.blade.php b/resources/views/process/index.blade.php index 3256cdf..0756f3f 100644 --- a/resources/views/process/index.blade.php +++ b/resources/views/process/index.blade.php @@ -41,7 +41,7 @@ {{$process->path}} @if ($process->image != null && $process) - {{basename($process->image)}} + {{basename($process->image)}} @endif {{$process->owner}} -- 2.39.5