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) {{-- メールアドレス --}}