mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-25 20:49:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3857 from Roardom/fix-id-validation

Browse Source 
(Fix) Allow `0000000`, etc. for id entry
This commit is contained in:
HDVinnie
2024-05-26 15:09:05 -04:00
committed by GitHub
parent 28a38e8358 ac21f8dcbf
commit 00a9b1ddc2
6 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Requests/StoreTorrentRequest.php
+14 -13
View File
@@ -141,7 +141,8 @@ class StoreTorrentRequest extends FormRequest
'imdb' => [
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'numeric',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
@@ -150,8 +151,8 @@ class StoreTorrentRequest extends FormRequest
'tvdb' => [
Rule::when($category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!$category->tv_meta, [
Rule::in([0]),
@@ -160,8 +161,8 @@ class StoreTorrentRequest extends FormRequest
'tmdb' => [
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
@@ -170,8 +171,8 @@ class StoreTorrentRequest extends FormRequest
'mal' => [
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
@@ -180,8 +181,8 @@ class StoreTorrentRequest extends FormRequest
'igdb' => [
Rule::when($category->game_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!$category->game_meta, [
Rule::in([0]),
@@ -190,16 +191,16 @@ class StoreTorrentRequest extends FormRequest
'season_number' => [
Rule::when($category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::prohibitedIf(!$category->tv_meta),
],
'episode_number' => [
Rule::when($category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::prohibitedIf(!$category->tv_meta),
],
app/Http/Requests/StoreTorrentRequestRequest.php
+10 -9
View File
@@ -48,7 +48,8 @@ class StoreTorrentRequestRequest extends FormRequest
'imdb' => [
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'numeric',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
@@ -57,8 +58,8 @@ class StoreTorrentRequestRequest extends FormRequest
'tvdb' => [
Rule::when($category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!$category->tv_meta, [
Rule::in([0]),
@@ -67,8 +68,8 @@ class StoreTorrentRequestRequest extends FormRequest
'tmdb' => [
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
@@ -77,8 +78,8 @@ class StoreTorrentRequestRequest extends FormRequest
'mal' => [
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
@@ -87,8 +88,8 @@ class StoreTorrentRequestRequest extends FormRequest
'igdb' => [
Rule::when($category->game_meta, [
'required',
'numeric',
'integer',
'decimal:0',
'min:0',
]),
Rule::when(!$category->game_meta, [
Rule::in([0]),
app/Http/Requests/UpdateTorrentRequest.php
+14 -7
View File
@@ -88,33 +88,40 @@ class UpdateTorrentRequest extends FormRequest
],
'imdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'tvdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'tmdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'mal' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'igdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'season_number' => [
Rule::when($category->tv_meta, 'required'),
Rule::when(!$category->tv_meta, 'nullable'),
'numeric',
'decimal:0',
'min:0',
],
'episode_number' => [
Rule::when($category->tv_meta, 'required'),
Rule::when(!$category->tv_meta, 'nullable'),
'numeric',
'decimal:0',
'min:0',
],
'anon' => [
'required',
app/Http/Requests/UpdateTorrentRequestRequest.php
+10 -5
View File
@@ -42,23 +42,28 @@ class UpdateTorrentRequestRequest extends FormRequest
],
'imdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'tvdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'tmdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'mal' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'igdb' => [
'required',
'numeric',
'decimal:0',
'min:0',
],
'category_id' => [
'required',
resources/views/requests/create.blade.php
+7 -1
View File
@@ -105,7 +105,7 @@
</label>
</p>
<div
class="form__group--short-horizontal"
class="form__group--horizontal"
x-show="cats[cat].type === 'movie' || cats[cat].type === 'tv' || cats[cat].type === 'game'"
>
<p
@@ -127,6 +127,7 @@
<label class="form__label form__label--floating" for="autotmdb">
TMDB ID
</label>
<span class="form__hint">Numeric digits only.</span>
</p>
<p
class="form__group"
@@ -147,6 +148,7 @@
<label class="form__label form__label--floating" for="autoimdb">
IMDB ID
</label>
<span class="form__hint">Numeric digits only.</span>
</p>
<p class="form__group" x-show="cats[cat].type === 'tv'">
<input type="hidden" name="tvdb" value="0" />
@@ -164,6 +166,7 @@
<label class="form__label form__label--floating" for="autotvdb">
TVDB ID
</label>
<span class="form__hint">Numeric digits only.</span>
</p>
<p
class="form__group"
@@ -184,6 +187,9 @@
<label class="form__label form__label--floating" for="automal">
MAL ID ({{ __('torrent.required-anime') }})
</label>
<span class="form__hint">
Numeric digits only. Required for anime. Use 0 otherwise.
</span>
</p>
<p class="form__group" x-show="cats[cat].type === 'game'">
<input
resources/views/torrent/create.blade.php
+1 -1
View File
@@ -327,7 +327,7 @@
<label class="form__label form__label--floating" for="autoimdb">
IMDB ID
</label>
<span class="form__hint">Numeric digits only. No leading zeros.</span>
<span class="form__hint">Numeric digits only.</span>
</p>
<p class="form__group" x-show="cats[cat].type === 'tv'">
<input type="hidden" name="tvdb" value="0" />