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

Merge branch 'feature/319-csv-export' into develop

Browse Source
This commit is contained in:
shibafu 2020-05-20 21:56:37 +09:00
commit 1671070d0c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/SettingController.php
View File

@ -90,6 +90,9 @@ class SettingController extends Controller
$filename = tempnam(sys_get_temp_dir(), 'tissue_export_tmp_'); $filename = tempnam(sys_get_temp_dir(), 'tissue_export_tmp_');
try { try {
// 気休め
set_time_limit(0);
$exporter = new CheckinCsvExporter(Auth::user(), $filename, $charsets[$validated['charset']]); $exporter = new CheckinCsvExporter(Auth::user(), $filename, $charsets[$validated['charset']]);
$exporter->execute(); $exporter->execute();
} catch (\Throwable $e) { } catch (\Throwable $e) {

2
app/Services/CheckinCsvExporter.php
View File

@ -46,7 +46,7 @@ class CheckinCsvExporter
$ejaculation->note, $ejaculation->note,
$ejaculation->link, $ejaculation->link,
]; ];
foreach ($ejaculation->tags as $tag) { foreach ($ejaculation->tags->take(32) as $tag) {
$record[] = $tag->name; $record[] = $tag->name;
} }
$csv->insertOne($record); $csv->insertOne($record);