@@ -15,7 +15,7 @@ |
||
| 15 | 15 | * @param Request $request |
| 16 | 16 | * @param Model $item |
| 17 | 17 | * @param array $fields |
| 18 | - * @param $groupName |
|
| 18 | + * @param string $groupName |
|
| 19 | 19 | * @param $fieldName |
| 20 | 20 | * @param bool $mustDeleteFilesInFilesystem |
| 21 | 21 | * @return array |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | namespace Anavel\Crud\Abstractor\Eloquent\Traits; |
| 5 | 5 | |
| 6 | 6 | use Illuminate\Database\Eloquent\Model; |
| 7 | -use Illuminate\Support\Facades\App; |
|
| 8 | 7 | use League\Flysystem\Adapter\Local; |
| 9 | 8 | use League\Flysystem\Filesystem; |
| 10 | 9 | use Illuminate\Http\Request; |
@@ -21,26 +21,26 @@ discard block |
||
| 21 | 21 | * @return array |
| 22 | 22 | * @throws \Exception |
| 23 | 23 | */ |
| 24 | - protected function handleField(Request $request, $item, array $fields, $groupName, $fieldName, $mustDeleteFilesInFilesystem=false) |
|
| 24 | + protected function handleField(Request $request, $item, array $fields, $groupName, $fieldName, $mustDeleteFilesInFilesystem = false) |
|
| 25 | 25 | { |
| 26 | 26 | |
| 27 | 27 | |
| 28 | - $normalizeGroupName = str_replace('.','#',$groupName); |
|
| 29 | - $contentFromUploadedField="uploaded-content.{$normalizeGroupName}#{$fieldName}#"; |
|
| 30 | - $modelFolder = $this->slug . DIRECTORY_SEPARATOR; |
|
| 31 | - $basePath = base_path(DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR .config('anavel-crud.uploads_path')); |
|
| 32 | - $modelPath = $basePath . $modelFolder; |
|
| 28 | + $normalizeGroupName = str_replace('.', '#', $groupName); |
|
| 29 | + $contentFromUploadedField = "uploaded-content.{$normalizeGroupName}#{$fieldName}#"; |
|
| 30 | + $modelFolder = $this->slug.DIRECTORY_SEPARATOR; |
|
| 31 | + $basePath = base_path(DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.config('anavel-crud.uploads_path')); |
|
| 32 | + $modelPath = $basePath.$modelFolder; |
|
| 33 | 33 | $skip = null; |
| 34 | 34 | $requestValue = null; |
| 35 | 35 | |
| 36 | 36 | |
| 37 | - if (! empty($fields["{$fieldName}__delete"])) { |
|
| 37 | + if (!empty($fields["{$fieldName}__delete"])) { |
|
| 38 | 38 | //We never want to save this field, it doesn't exist in the DB |
| 39 | 39 | $skip = "{$fieldName}__delete"; |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | //If user wants to delete the existing file |
| 43 | - if (! empty($request->input("{$groupName}.{$fieldName}__delete"))) { |
|
| 43 | + if (!empty($request->input("{$groupName}.{$fieldName}__delete"))) { |
|
| 44 | 44 | $adapter = new Local($basePath); |
| 45 | 45 | $filesystem = new Filesystem($adapter); |
| 46 | 46 | if ($filesystem->has($item->$fieldName) && $mustDeleteFilesInFilesystem) { |
@@ -58,32 +58,32 @@ discard block |
||
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - if($request->has($contentFromUploadedField)) |
|
| 61 | + if ($request->has($contentFromUploadedField)) |
|
| 62 | 62 | { |
| 63 | 63 | $requestValue = $request->input($contentFromUploadedField); |
| 64 | 64 | |
| 65 | - }elseif ($request->hasFile($groupName .'.'.$fieldName)) { |
|
| 66 | - $fileName = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_FILENAME); |
|
| 67 | - $extension = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_EXTENSION); |
|
| 65 | + }elseif ($request->hasFile($groupName.'.'.$fieldName)) { |
|
| 66 | + $fileName = pathinfo($request->file($groupName.'.'.$fieldName)->getClientOriginalName(), PATHINFO_FILENAME); |
|
| 67 | + $extension = pathinfo($request->file($groupName.'.'.$fieldName)->getClientOriginalName(), PATHINFO_EXTENSION); |
|
| 68 | 68 | |
| 69 | - $fileName = uniqid() . '_' . slugify($fileName); |
|
| 70 | - if (! empty($extension)) { |
|
| 71 | - $fileName .= '.' . $extension; |
|
| 69 | + $fileName = uniqid().'_'.slugify($fileName); |
|
| 70 | + if (!empty($extension)) { |
|
| 71 | + $fileName .= '.'.$extension; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | |
| 75 | - $request->file($groupName .'.'.$fieldName)->move( |
|
| 75 | + $request->file($groupName.'.'.$fieldName)->move( |
|
| 76 | 76 | $modelPath, |
| 77 | 77 | $fileName |
| 78 | 78 | ); |
| 79 | 79 | |
| 80 | - $requestValue = $modelFolder . $fileName; |
|
| 81 | - } elseif (! empty($request->file($groupName .'.'.$fieldName)) && ! $request->file($groupName .'.'.$fieldName)->isValid()) { |
|
| 82 | - throw new \Exception($request->file($groupName .'.'.$fieldName)->getErrorMessage()); |
|
| 80 | + $requestValue = $modelFolder.$fileName; |
|
| 81 | + } elseif (!empty($request->file($groupName.'.'.$fieldName)) && !$request->file($groupName.'.'.$fieldName)->isValid()) { |
|
| 82 | + throw new \Exception($request->file($groupName.'.'.$fieldName)->getErrorMessage()); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | //Avoid losing the existing filename if the user doesn't change it: |
| 86 | - if (empty($requestValue) && (! empty($item->$fieldName))) { |
|
| 86 | + if (empty($requestValue) && (!empty($item->$fieldName))) { |
|
| 87 | 87 | $requestValue = $item->$fieldName; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | { |
| 63 | 63 | $requestValue = $request->input($contentFromUploadedField); |
| 64 | 64 | |
| 65 | - }elseif ($request->hasFile($groupName .'.'.$fieldName)) { |
|
| 65 | + } elseif ($request->hasFile($groupName .'.'.$fieldName)) { |
|
| 66 | 66 | $fileName = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_FILENAME); |
| 67 | 67 | $extension = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_EXTENSION); |
| 68 | 68 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | $config = [ |
| 149 | 149 | 'name' => $columnName, |
| 150 | - 'presentation' => $this->name . ' ' . ucfirst(transcrud($columnName)), |
|
| 150 | + 'presentation' => $this->name.' '.ucfirst(transcrud($columnName)), |
|
| 151 | 151 | 'form_type' => $formType, |
| 152 | 152 | 'no_validate' => true, |
| 153 | 153 | 'validation' => null, |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $field = $this->fieldFactory |
| 169 | 169 | ->setColumn($column) |
| 170 | 170 | ->setConfig([ |
| 171 | - 'name' => $columnName . '__delete', |
|
| 171 | + 'name' => $columnName.'__delete', |
|
| 172 | 172 | 'presentation' => null, |
| 173 | 173 | 'form_type' => 'checkbox', |
| 174 | 174 | 'no_validate' => true, |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | 'functions' => null |
| 177 | 177 | ]) |
| 178 | 178 | ->get(); |
| 179 | - $fields[$columnName . '__delete'] = $field; |
|
| 179 | + $fields[$columnName.'__delete'] = $field; |
|
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | } |
@@ -221,12 +221,12 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | if (get_class($field->getFormField()) === \FormManager\Fields\File::class) { |
| 223 | 223 | $handleResult = $this->handleField($request, $relationModel, $fieldsBase, |
| 224 | - $this->name . ".$relationIndex", $fieldName, $this->modelAbstractor->mustDeleteFilesInFilesystem()); |
|
| 225 | - if (! empty($handleResult['skip'])) { |
|
| 224 | + $this->name.".$relationIndex", $fieldName, $this->modelAbstractor->mustDeleteFilesInFilesystem()); |
|
| 225 | + if (!empty($handleResult['skip'])) { |
|
| 226 | 226 | $skip = $handleResult['skip']; |
| 227 | 227 | unset($relationArray[$relationIndex][$skip]); |
| 228 | 228 | } |
| 229 | - if (! empty($handleResult['requestValue'])) { |
|
| 229 | + if (!empty($handleResult['requestValue'])) { |
|
| 230 | 230 | $relationArray[$relationIndex][$fieldName] = $handleResult['requestValue']; |
| 231 | 231 | } |
| 232 | 232 | } |