minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into test.customwristbands.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-04-20 19:23:38 +02:00
parent 6dd6394ff1 93bafee2e7
commit bfcab20dad
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/EditUploadedFile.php
+2 -1
View File
@@ -82,10 +82,11 @@ class EditUploadedFile extends Controller
return $this->fileNotFound(); return $this->fileNotFound();
} }
$directoryId = $file->directory_id;
$file->delete(); $file->delete();
return redirect() return redirect()
->route('upload.overview') ->route('upload.overview', ['id' => $directoryId])
->with('success', trans('admin/fileManager.fileDeleted')); ->with('success', trans('admin/fileManager.fileDeleted'));
} }
resources/views/admin/content/overview.blade.php
+1 -3
View File
@@ -31,11 +31,9 @@
</div> </div>
@endif @endif
@include('admin.content.overviewTiles') @include('admin.content.overviewTiles')
<div class="row"> <div class="row">
{{$pages->render()}} {!! $pages->render() !!}
</div> </div>
@stop @stop