チキン
このコミットが含まれているのは:
コミット
bd56414411
|
@ -127,7 +127,7 @@ class MeetingApprovalsController extends Controller {
|
|||
}
|
||||
|
||||
foreach ($params as $p) {
|
||||
if (null === ($p->child_id = Child::select($child_select)->where('id', (int)$p->child_id)->first())) {
|
||||
if (null === ($p->child = Child::select($child_select)->where('id', (int)$p->child_id)->first())) {
|
||||
return ['status_code' => 400];
|
||||
}
|
||||
}
|
||||
|
@ -149,7 +149,7 @@ class MeetingApprovalsController extends Controller {
|
|||
}
|
||||
|
||||
foreach ($params as $p) {
|
||||
if (null === ($p->child_id = Child::select($child_select)->where('id', (int)$p->child_id)->first())) {
|
||||
if (null === ($p->child = Child::select($child_select)->where('id', (int)$p->child_id)->first())) {
|
||||
return ['status_code' => 400];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -236,14 +236,14 @@ class MeetingsController extends Controller {
|
|||
return ['status_code' => 400];
|
||||
}
|
||||
foreach ($list as $i => $l) {
|
||||
if (null !== ($l->approval = MeetingApprovals::select($meeting_approvals_select)->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->get())) {
|
||||
foreach ($l->approval as $ii => $ll) {
|
||||
if (null !== ($l->approvals = MeetingApprovals::select($meeting_approvals_select)->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->get())) {
|
||||
foreach ($l->approvals as $ii => $ll) {
|
||||
if (null === ($ll->child = Child::select($child_select)->where('id', (int)$ll->child_id)->first())) {
|
||||
$ll->child = [];
|
||||
}
|
||||
}
|
||||
|
||||
$result[] = $l;
|
||||
$result[] = $l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -266,14 +266,14 @@ class MeetingsController extends Controller {
|
|||
}
|
||||
|
||||
foreach ($list as $i => $l) {
|
||||
if (null !== ($l->approval = MeetingApprovals::select($meeting_approvals_select)->whereNull('approval_at')->where('meeting_id', (int)$l->id)->get())) {
|
||||
foreach ($l->approval as $ii => $ll) {
|
||||
if (null !== ($l->approvals = MeetingApprovals::select($meeting_approvals_select)->whereNull('approval_at')->where('meeting_id', (int)$l->id)->get())) {
|
||||
foreach ($l->approvals as $ii => $ll) {
|
||||
if (null === ($ll->child = Child::select($child_select)->where('id', (int)$ll->child_id)->first())) {
|
||||
$ll->child = [];
|
||||
}
|
||||
}
|
||||
|
||||
$result[] = $l;
|
||||
$result[] = $l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
新しいイシューから参照