Merge branch 'dev' into test.customwristbands.cz

2016-04-20 19:23:38 +02:00
parent 6dd6394ff1 93bafee2e7
commit bfcab20dad
2 changed files with 3 additions and 4 deletions
@@ -82,10 +82,11 @@ class EditUploadedFile extends Controller
            return $this->fileNotFound();
        }

+        $directoryId = $file->directory_id;
        $file->delete();

        return redirect()
-            ->route('upload.overview')
+            ->route('upload.overview', ['id' => $directoryId])
            ->with('success', trans('admin/fileManager.fileDeleted'));
    }

@@ -31,11 +31,9 @@
        </div>
    @endif

-
-
    @include('admin.content.overviewTiles')

    <div class="row">
-        {{$pages->render()}}
+        {!! $pages->render() !!}
    </div>
@stop