pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

複数行入力可能な項目は、処理前に改行コードを正規化する

Browse Source 
fix #1
This commit is contained in:
shibafu 2018-01-02 23:37:27 +09:00
parent 4f475aed3e
commit bd19018699
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/EjaculationController.php
View File

@ -18,14 +18,19 @@ class EjaculationController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
Validator::make($request->all(), [ $inputs = $request->all();
if ($request->has('note')) {
$inputs['note'] = str_replace(["\r\n", "\r"], "\n", $inputs['note']);
}
Validator::make($inputs, [
'date' => 'required|date_format:Y/m/d', 'date' => 'required|date_format:Y/m/d',
'time' => 'required|date_format:H:i', 'time' => 'required|date_format:H:i',
'note' => 'nullable|string|max:500', 'note' => 'nullable|string|max:500',
])->after(function ($validator) use ($request) { ])->after(function ($validator) use ($request, $inputs) {
// 日時の重複チェック // 日時の重複チェック
if (!$validator->errors()->hasAny(['date', 'time'])) { if (!$validator->errors()->hasAny(['date', 'time'])) {
$dt = $request->input('date') . ' ' . $request->input('time'); $dt = $inputs['date'] . ' ' . $inputs['time'];
if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $dt])->count()) { if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $dt])->count()) {
$validator->errors()->add('datetime', '既にこの日時にチェックインしているため、登録できません。'); $validator->errors()->add('datetime', '既にこの日時にチェックインしているため、登録できません。');
} }
@ -34,8 +39,8 @@ class EjaculationController extends Controller
$ejaculation = Ejaculation::create([ $ejaculation = Ejaculation::create([
'user_id' => Auth::id(), 'user_id' => Auth::id(),
'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $request->input('date') . ' ' . $request->input('time')), 'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
'note' => $request->input('note') ?? '', 'note' => $inputs['note'] ?? '',
'is_private' => $request->has('is_private') ?? false 'is_private' => $request->has('is_private') ?? false
]); ]);