Merge pull request #492 from shikorism/fix/489-fix-copipe

チェックイン編集・流用時のフラグ周りの動作修正
This commit is contained in:
shibafu 2020-08-23 13:12:44 +09:00 committed by GitHub
commit d1f14ed271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -101,6 +101,7 @@ class Ejaculation extends Model
return route('checkin', [ return route('checkin', [
'link' => $this->link, 'link' => $this->link,
'tags' => $this->textTags(), 'tags' => $this->textTags(),
'is_private' => $this->is_private,
'is_too_sensitive' => $this->is_too_sensitive, 'is_too_sensitive' => $this->is_too_sensitive,
]); ]);
} }

View File

@ -144,7 +144,7 @@ class EjaculationController extends Controller
'link' => old('link') ?? $ejaculation->link, 'link' => old('link') ?? $ejaculation->link,
'tags' => $tags, 'tags' => $tags,
'note' => old('note') ?? $ejaculation->note, 'note' => old('note') ?? $ejaculation->note,
'is_private' => is_bool(old('is_private')) ? old('is_private') : $ejaculation->note, 'is_private' => is_bool(old('is_private')) ? old('is_private') : $ejaculation->is_private,
'is_too_sensitive' => is_bool(old('is_too_sensitive')) ? old('is_too_sensitive') : $ejaculation->is_too_sensitive 'is_too_sensitive' => is_bool(old('is_too_sensitive')) ? old('is_too_sensitive') : $ejaculation->is_too_sensitive
], ],
'errors' => isset($errors) ? $errors->getMessages() : null 'errors' => isset($errors) ? $errors->getMessages() : null