Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account
このコミットが含まれているのは:
コミット
becc7a0941
|
@ -528,17 +528,15 @@ class MeetingsController extends Controller {
|
||||||
$pdf = base64_decode(substr($r->pdf, strpos($r->pdf, ',') + 1));
|
$pdf = base64_decode(substr($r->pdf, strpos($r->pdf, ',') + 1));
|
||||||
$update['pdf'] = '/storage/'.$filename;
|
$update['pdf'] = '/storage/'.$filename;
|
||||||
|
|
||||||
if ($chk = Meeting::select('pdf')->where('id', (int)$meeting_id)->first()) {
|
if ($chk = Meeting::select('pdf')->where('id', (int)$meeting_id)->first() && strcmp($chk->pdf, $r->pdf) != 0) {
|
||||||
if (Storage::disk('public')->exists($chk->pdf)) {
|
if (Storage::disk('public')->exists($chk->pdf)) {
|
||||||
if (Storage::disk('public')->get($chk->pdf) != $pdf) {
|
if (Storage::disk('public')->get($chk->pdf) != $pdf) {
|
||||||
Storage::disk('public')->delete($chk->pdf);
|
Storage::disk('public')->delete($chk->pdf);
|
||||||
Storage::disk('public')->put($filename, $pdf);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
Storage::disk('public')->put($filename, $pdf);
|
Storage::disk('public')->put($filename, $pdf);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Meeting::where('id', (int)$meeting_id)->update($update);
|
Meeting::where('id', (int)$meeting_id)->update($update);
|
||||||
|
|
新しいイシューから参照