Skip to content

Commit c5ac190

Browse files
authored
Merge pull request #18 from aryehraber/fix/delete-all
Remove "Delete All" button
2 parents 8622c14 + 2b5301e commit c5ac190

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

resources/views/show.blade.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,7 @@
4343
@csrf
4444
@method('delete')
4545

46-
@if(count($files) > 1)
47-
<dropdown-list class="inline-block ml-2">
48-
<template #trigger>
49-
<button class="btn-danger flex items-center pr-3 hover:text-white" type="button">
50-
{{ __('Delete Log') }} <svg-icon name="micro/chevron-down-xs" class="w-2 ml-2"></svg-icon>
51-
</button>
52-
</template>
53-
54-
<button name="log" value="{{ urlencode($currentFile) }}" data-delete>{{ __('Delete Current Log') }}</button>
55-
56-
<button name="log" value="all" data-delete>{{ __('Delete All Logs') }}</button>
57-
</dropdown-list>
58-
@else
59-
<button class="btn-danger ml-2" name="log" value="{{ urlencode($currentFile) }}" data-delete>{{ __('Delete Log') }}</button>
60-
@endif
46+
<button class="btn-danger ml-2" name="log" value="{{ urlencode($currentFile) }}" data-delete>{{ __('Delete Log') }}</button>
6147
</form>
6248
</div>
6349
@endif

src/LogbookController.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace AryehRaber\Logbook;
44

55
use Illuminate\Http\Request;
6-
use Statamic\Http\Controllers\Controller;
6+
use Illuminate\Support\Facades\File;
77
use Rap2hpoutre\LaravelLogViewer\LaravelLogViewer;
8+
use Statamic\Http\Controllers\Controller;
89

910
class LogbookController extends Controller
1011
{
@@ -31,15 +32,7 @@ public function destroy(Request $request, LaravelLogViewer $logviewer)
3132
return redirect(cp_route('utilities.logbook.show'));
3233
}
3334

34-
if ($file === 'all') {
35-
foreach ($logviewer->getFiles(true) as $file) {
36-
app('files')->delete($logviewer->pathToLogFile($file));
37-
}
38-
39-
return redirect(cp_route('utilities.logbook.show'))->with('success', 'All log files deleted.');
40-
}
41-
42-
app('files')->delete($logviewer->pathToLogFile(urldecode($file)));
35+
File::delete($logviewer->pathToLogFile(urldecode($file)));
4336

4437
return redirect(cp_route('utilities.logbook.show'))->with('success', 'Log file deleted.');
4538
}

0 commit comments

Comments
 (0)