minor #7981 Update upload_file.rst (rumours86)

xabbuh · xabbuh · commit 7fb088798115 · 2017-09-03T10:09:53.000+02:00
This PR was submitted for the 3.3 branch but it was merged into the 2.7 branch instead (closes #7981). Discussion ---------- Update upload_file.rst If you edit an existing product with an attached file and do not fill in the fields for the file, after saving the field with the file is reset Commits ------- d015048 Update upload_file.rst
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -332,6 +332,7 @@ automatically upload the file when persisting the entity::
     class BrochureUploadListener
     {
         private $uploader;
+        private $fileName;
 
         public function __construct(FileUploader $uploader)
         {
@@ -362,11 +363,10 @@ automatically upload the file when persisting the entity::
             $file = $entity->getBrochure();
 
             // only upload new files
-            if (!$file instanceof UploadedFile) {
-                return;
+            if ($file instanceof UploadedFile) {
+                $fileName = $this->uploader->upload($file);
             }
 
-            $fileName = $this->uploader->upload($file);
             $entity->setBrochure($fileName);
         }
     }
@@ -449,8 +449,9 @@ controller.
                     return;
                 }
 
-                if ($fileName = $entity->getBrochure()) {
-                    $entity->setBrochure(new File($this->uploader->getTargetDir().'/'.$fileName));
+                $this->fileName = $entity->getBrochure()
+                if ($this->fileName) {
+                    $entity->setBrochure(new File($this->uploader->getTargetDir().'/'.$this->fileName));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ automatically upload the file when persisting the entity::`
`332`	`332`	`class BrochureUploadListener`
`333`	`333`	`{`
`334`	`334`	`private $uploader;`
	`335`	`+ private $fileName;`
`335`	`336`
`336`	`337`	`public function __construct(FileUploader $uploader)`
`337`	`338`	`{`
`@@ -362,11 +363,10 @@ automatically upload the file when persisting the entity::`
`362`	`363`	`$file = $entity->getBrochure();`
`363`	`364`
`364`	`365`	`// only upload new files`
`365`		`- if (!$file instanceof UploadedFile) {`
`366`		`- return;`
	`366`	`+ if ($file instanceof UploadedFile) {`
	`367`	`+ $fileName = $this->uploader->upload($file);`
`367`	`368`	`}`
`368`	`369`
`369`		`- $fileName = $this->uploader->upload($file);`
`370`	`370`	`$entity->setBrochure($fileName);`
`371`	`371`	`}`
`372`	`372`	`}`
`@@ -449,8 +449,9 @@ controller.`
`449`	`449`	`return;`
`450`	`450`	`}`
`451`	`451`
`452`		`- if ($fileName = $entity->getBrochure()) {`
`453`		`- $entity->setBrochure(new File($this->uploader->getTargetDir().'/'.$fileName));`
	`452`	`+ $this->fileName = $entity->getBrochure()`
	`453`	`+ if ($this->fileName) {`
	`454`	`+ $entity->setBrochure(new File($this->uploader->getTargetDir().'/'.$this->fileName));`
`454`	`455`	`}`
`455`	`456`	`}`
`456`	`457`	`}`