From 0621c0e936eefcfb48ce626fec3d65bdbeb8fead Mon Sep 17 00:00:00 2001 From: anouk Date: Mon, 30 Dec 2024 17:55:22 +0100 Subject: [PATCH] Remove unnecessary route redirect --- .../views/volumes/videos/index/meta.blade.php | 90 +++++++++---------- .../Views/Videos/VideoControllerTest.php | 6 -- 2 files changed, 44 insertions(+), 52 deletions(-) diff --git a/resources/views/volumes/videos/index/meta.blade.php b/resources/views/volumes/videos/index/meta.blade.php index ef3df0a19..9363f91a8 100644 --- a/resources/views/volumes/videos/index/meta.blade.php +++ b/resources/views/volumes/videos/index/meta.blade.php @@ -1,51 +1,49 @@ -
+

Video information

-
- - @if ($video->width && $video->height) - - - - - @endif - @if ($video->size) - - - - - @endif - @if ($video->mimetype) - - - - - @endif - @if ($video->taken_at) - - - @if (is_array($video->taken_at)) - @foreach ($video->taken_at as $value) - - @endforeach - @else - - @endif - - @endif - @foreach ($metadata as $key => $field) - - - @if (is_array($field)) - @foreach ($field as $value) - - @endforeach - @else +
Dimensions{{ $video->width }} × {{ $video->height }} px
Size{{ round($video->size / 1E+6, 2) }} MBytes
MIME{{ $video->mimetype }}
Created{{ $value }}{{ $video->taken_at }}
{{ $metadataMap[$key] }}{{ $value }}
+ @if ($video->width && $video->height) + + + + + @endif + @if ($video->size) + + + + + @endif + @if ($video->mimetype) + + + + + @endif + @if ($video->taken_at) + + + @if (is_array($video->taken_at)) + @foreach ($video->taken_at as $value) - @endif - - @endforeach -
Dimensions{{ $video->width }} × {{ $video->height }} px
Size{{ round($video->size / 1E+6, 2) }} MBytes
MIME{{ $video->mimetype }}
Created{{ $value }}
-
+ @endforeach + @else + {{ $video->taken_at }} + @endif + + @endif + @foreach ($metadata as $key => $field) + + {{ $metadataMap[$key] }} + @if (is_array($field)) + @foreach ($field as $value) + {{ $value }} + @endforeach + @else + {{ $value }} + @endif + + @endforeach +
diff --git a/tests/php/Http/Controllers/Views/Videos/VideoControllerTest.php b/tests/php/Http/Controllers/Views/Videos/VideoControllerTest.php index 425ed26b6..714675547 100644 --- a/tests/php/Http/Controllers/Views/Videos/VideoControllerTest.php +++ b/tests/php/Http/Controllers/Views/Videos/VideoControllerTest.php @@ -20,10 +20,4 @@ public function testShow() $this->beGuest(); $this->get("videos/{$video->id}/annotations")->assertStatus(200); } - - public function testShowRedirect() - { - $this->beUser(); - $this->get('video-annotate/999')->assertRedirect('/videos/999/annotations'); - } }