From 82cefd1c4c8ea740188ffb877d74abd62b11ca33 Mon Sep 17 00:00:00 2001 From: Sebastien Hattry Date: Fri, 24 Feb 2023 08:28:17 +0000 Subject: [PATCH] Hide buttons when no link associated --- app/Http/Requests/UpdateEngagement.php | 15 ++++++++++----- .../views/bo/engagements/form-inputs.blade.php | 9 +++++++-- .../engageetresponsable/blocs/bloc1.blade.php | 2 +- .../engageetresponsable/blocs/bloc2.blade.php | 2 +- .../engageetresponsable/blocs/bloc3.blade.php | 2 +- .../engageetresponsable/blocs/bloc4.blade.php | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/Http/Requests/UpdateEngagement.php b/app/Http/Requests/UpdateEngagement.php index 6f3b424c..1c4c9e08 100644 --- a/app/Http/Requests/UpdateEngagement.php +++ b/app/Http/Requests/UpdateEngagement.php @@ -129,9 +129,14 @@ class UpdateEngagement extends FormRequest }//end if break; case InputType::url()->value: + if ($iptName === "link") { + $ruleAtt = "sometimes"; + } else { + $ruleAtt = "required"; + } $rules = array_merge($rules, [ "content.$i.content.$iptName.value" => [ - 'required', 'url', + $ruleAtt, 'url', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed function ($attribute, $value, $fail) { try { @@ -172,10 +177,10 @@ class UpdateEngagement extends FormRequest "content.$i.content.$iptName.value" => 'boolean' ]); break; - }//end switch - }//end foreach - }//end foreach - }//end if + } //end switch + } //end foreach + } //end foreach + } //end if return $rules; } } diff --git a/resources/views/bo/engagements/form-inputs.blade.php b/resources/views/bo/engagements/form-inputs.blade.php index 90d04b1c..722b700c 100644 --- a/resources/views/bo/engagements/form-inputs.blade.php +++ b/resources/views/bo/engagements/form-inputs.blade.php @@ -32,8 +32,13 @@ $content = $engagement->content; @case(InputType::url()->value) @case(InputType::string()->value)
- - + @if($k === 'link') + + + @else + + + @endif
@break @case(InputType::text()->value) diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php index 31e9bcc3..d99e5fa3 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php @@ -5,7 +5,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && $bloc['content']['link']['value'] !== "") diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php index e2f186bf..fadab8b0 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php @@ -7,7 +7,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && $bloc['content']['link']['value'] !== "") diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php index aca59382..0db1f6bb 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php @@ -5,7 +5,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && $bloc['content']['link']['value'] !== "") diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php index eabd9ce5..9bfdfa92 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php @@ -5,7 +5,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && $bloc['content']['link']['value'] !== "")