FEATURE #1508: add directories to uploaded files

This commit contains both creating and editing directories.
2016-03-13 22:49:29 +01:00
parent 8af9943100
commit 069367a816
12 changed files with 350 additions and 31 deletions
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Models\Directory;
+
+class CreateNewDirectory extends Controller
+{
+    /**
+     * Create new directory
+     *
+     * @param Requests\CreateNewDirectoryRequest $request
+     *
+     * @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     */
+    public function postNew(Requests\CreateNewDirectoryRequest $request)
+    {
+        // check if created folder does not exist in current directory
+        $exists = Directory::where('name', $request->name)
+                           ->where('parent_id', $request->parentDirectory)
+                           ->exists();
+        if ($exists) {
+            if ($request->ajax()) {
+                return response()->json([
+                                            'status'  => 'failed',
+                                            'message' => trans('admin/fileManager.subdirectoryExists')
+                                        ]);
+            } else {
+                return redirect()
+                    ->route('upload.overview', ['id' => $request->parentDirectory])
+                    ->with('error', trans('admin/fileManager.subdirectoryExists'))
+                    ->withInput();
+            }
+        }
+
+        // create new database entry
+        $directory = new Directory();
+        $directory->name = $request->name;
+        $directory->parent_id = $request->parentDirectory;
+        $directory->user_id = \Auth::user()->id;
+        $directory->description = $request->description;
+
+        $directory->save();
+
+        $message = trans('admin/fileManager.newDirectorySuccess');
+        if (!$request->ajax()) {
+            return redirect()
+                ->route('upload.overview', ['id' => $request->parentDirectory])
+                ->with('success', $message);
+        } else {
+            $payload = [
+                'status'          => 'success',
+                'message'         => $message,
+                'parentDirectory' => $request->parentDirectory
+            ];
+
+            return response()->json($payload);
+        }
+    }
+}
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Models\Directory;
+
+class EditDirectory extends Controller
+{
+    /**
+     * @param Requests\EditDirectoryRequest $request
+     * @param                               $directoryId
+     *
+     * @return $this|\Illuminate\Http\JsonResponse
+     */
+    public function postEdit(Requests\EditDirectoryRequest $request, $directoryId)
+    {
+        $directory = Directory::findOrFail($directoryId);
+
+        // check if given name is not used in parent directory
+
+        $exists = Directory::where('parent_id', $directory->parent_id)
+                           ->where('name', $request->name)
+                           ->where('id', '!=', $directoryId)
+                           ->exists();
+
+        if ($exists) {
+            if ($request->ajax()) {
+                return response()->json([
+                                            'status'  => 'failed',
+                                            'message' => trans('admin/fileManager.subdirectoryExists')
+                                        ]);
+            } else {
+                return redirect()
+                    ->route('upload.overview', ['id' => $directoryId])
+                    ->with('error', trans('admin/fileManager.subdirectoryExists'))
+                    ->withInput();
+            }
+        }
+
+        $directory->name = $request->name;
+        $directory->description = $request->description;
+
+        $directory->save();
+
+        $message = trans('admin/fileManager.editDirectorySuccess');
+        if (!$request->ajax()) {
+            return redirect()
+                ->route('upload.overview', ['id' => $directory->id])
+                ->with('success', $message);
+        } else {
+            $payload = [
+                'status'  => 'success',
+                'message' => $message
+            ];
+
+            return response()->json($payload);
+        }
+    }
+}