From d7e90764e80fd66a9a49f6ba9285a3904cd3be3f Mon Sep 17 00:00:00 2001
From: gakigaki <e3e3e3d@gmail.com>
Date: Mon, 9 Feb 2026 17:53:49 +0900
Subject: [PATCH] =?UTF-8?q?fix(mypage):=20=E3=83=97=E3=83=AD=E3=83=95?=
 =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E3=81=AE=E3=83=A1=E3=83=BC=E3=83=AB?=
 =?UTF-8?q?=E5=BF=85=E9=A0=88=E3=82=92=E5=8F=8D=E6=98=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Plugins/Mypage/ProfileMypage/ProfileMypage.php         | 7 ++++++-
 resources/views/plugins/mypage/profile/edit_form.blade.php | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Plugins/Mypage/ProfileMypage/ProfileMypage.php b/app/Plugins/Mypage/ProfileMypage/ProfileMypage.php
index 64a2db954..7c68dc328 100644
--- a/app/Plugins/Mypage/ProfileMypage/ProfileMypage.php
+++ b/app/Plugins/Mypage/ProfileMypage/ProfileMypage.php
@@ -104,7 +104,12 @@ public function update($request, $id)
                 $validator_array['column']['userid'] = UsersTool::getDefaultColumnAdditionalRules($base_rules, $users_column);
             } elseif ($users_column->column_type == UserColumnType::user_email) {
                 // $validator_array['column']['email'] = ['nullable', 'email', 'max:255', Rule::unique('users')->ignore($id)];
-                $base_rules = ['nullable', 'email', 'max:255', new CustomValiUserEmailUnique($request->columns_set_id, $id)];
+                $base_rules = ['email', 'max:255', new CustomValiUserEmailUnique($request->columns_set_id, $id)];
+                if ($users_column->required) {
+                    array_unshift($base_rules, 'required');
+                } else {
+                    array_unshift($base_rules, 'nullable');
+                }
                 $validator_array['column']['email'] = UsersTool::getDefaultColumnAdditionalRules($base_rules, $users_column);
             } elseif ($users_column->column_type == UserColumnType::user_password) {
                 // 入力があったら、ここで現在のパスワードチェック
diff --git a/resources/views/plugins/mypage/profile/edit_form.blade.php b/resources/views/plugins/mypage/profile/edit_form.blade.php
index b6b82c9f9..a84b9be26 100644
--- a/resources/views/plugins/mypage/profile/edit_form.blade.php
+++ b/resources/views/plugins/mypage/profile/edit_form.blade.php
@@ -45,10 +45,12 @@
         @elseif ($column->column_type == UserColumnType::user_email)
             {{-- メールアドレス --}}
             <div class="form-group row">
-                <label for="email" class="col-md-4 col-form-label text-md-right">{{$column->column_name}}</label>
+                <label for="email" class="col-md-4 col-form-label text-md-right">
+                    {{$column->column_name}} @if ($column->required)<span class="badge badge-danger">必須</span>@endif
+                </label>
 
                 <div class="col-md-8">
-                    <input id="email" type="text" class="form-control @if ($errors->has('email')) border-danger @endif" name="email" value="{{ old('email', $user->email) }}" placeholder="{{ $column->place_holder ?? __('messages.input_email') }}">
+                    <input id="email" type="text" class="form-control @if ($errors->has('email')) border-danger @endif" name="email" value="{{ old('email', $user->email) }}" placeholder="{{ $column->place_holder ?? __('messages.input_email') }}" @if ($column->required) required @endif>
                     @include('plugins.common.errors_inline', ['name' => 'email'])
                     <div class="small {{ $column->caption_color }}">{!! nl2br((string)$column->caption) !!}</div>
                 </div>
@@ -117,4 +119,3 @@
         </div>
     </div>
 </form>
-