Fix multiple files

Author: rkit

README.md

@@ -105,7 +105,7 @@ Add the following in your config, in section `components`
                        // save file id in this table
                        // 'saveFileId' => true,
 
-                       // protected a file
+                       // inaccessible from the web
                        // 'protected' => true,
 
                        // @see http://www.yiiframework.com/doc-2.0/guide-tutorial-core-validators.html
@@ -199,7 +199,7 @@ Add the following in your config, in section `components`
      <a href="<?= $file->path()?>" target="_blank">
        <img src="<?= $model->thumb('gallery', '80x80', $file->path())?>">
      </a>
-     <?= Html::textInput(Html::getInputName($model, $attribute) . '[' . $file->id .']', $file->title, [
+     <?= Html::textInput(Html::getInputName($model, $attribute) . '[files][' . $file->id .']', $file->title, [
          'class' => 'form-control',
      ])?>
    </li>

src/behaviors/FileBehavior.php

@@ -340,6 +340,7 @@ private function bindSingleFile($file, $ownerId)
      */
     private function bindMultiple($ownerId, $ownerType, $files)
     {
+        $files = ArrayHelper::getValue($files, 'files', []);
         $newFiles = ArrayHelper::index(File::findAll(array_keys($files)), 'id');
         $currentFiles = ArrayHelper::index(File::getByOwner($ownerId, $ownerType), 'id');
 
@@ -350,7 +351,7 @@ private function bindMultiple($ownerId, $ownerType, $files)
                     continue;
                 }
                 if (!$this->bindMultipleFile($file, $ownerId, $files)) {
-                    return false;
+                    continue;
                 }
             }
 

tests/BaseTest.php

@@ -139,7 +139,7 @@ protected function checkUploadFileResponse($response)
      */
     protected function checkUploadGalleryResponse($response)
     {
-        preg_match('/News\[(.*?)\]\[(.*?)\]/', $response, $matches);
+        preg_match('/News\[(.*?)\]\[files\]\[(.*?)\]/', $response, $matches);
 
         $this->assertTrue(is_string($response));
         $this->assertTrue(isset($matches[2]));
@@ -193,7 +193,7 @@ protected function uploadGallery($config)
         $response = $this->checkUploadGalleryResponse($response);
 
         $file = File::findOne($response[1]);
-        $model = new News(['title' => 'test', $config['attribute'] => [$file->id => 'test']]);
+        $model = new News(['title' => 'test', $config['attribute'] => ['files' => [$file->id => 'test']]]);
         $ownerType = $model->getFileOwnerType($config['attribute']);
 
         $this->checkTmpFile($file, -1, $ownerType);

tests/GalleryUploadTest.php

@@ -81,7 +81,7 @@ public function testAnotherOwnerGallery()
             'saveAfterUpload' => true
         ]);
 
-        $model->image_gallery = [$response['id'] => 'test'];
+        $model->image_gallery = ['files' => [$response['id'] => 'test']];
         $model->save();
 
         $file = File::findOne($response['id']);
@@ -108,6 +108,34 @@ public function testEmptyGallery()
         $this->assertCount(0, $model->getFiles('image_gallery'));
     }
 
+    public function testRemoveFileFromGallery()
+    {
+        extract($this->uploadGallery([
+            'modelName' => News::className(),
+            'attribute' => 'image_gallery',
+            'inputName' => 'file-300',
+            'multiple' => true,
+            'template' => Yii::getAlias('@tests/data/views/gallery-item.php')
+        ]));
+
+        $this->assertCount(1, $model->getFiles('image_gallery'));
+
+        $response = $this->runAction([
+            'modelName' => News::className(),
+            'attribute' => 'image_gallery',
+            'inputName' => 'file-500',
+            'saveAfterUpload' => true,
+            'ownerId' => $model->id
+        ]);
+
+        $this->assertCount(2, $model->getFiles('image_gallery'));
+
+        $model->image_gallery = ['files' => [$response['id'] => 'test']];
+        $model->save();
+
+        $this->assertCount(1, $model->getFiles('image_gallery'));
+    }
+
     public function testWrongGallery()
     {
         extract($this->uploadGallery([
@@ -118,7 +146,7 @@ public function testWrongGallery()
             'template' => Yii::getAlias('@tests/data/views/gallery-item.php')
         ]));
 
-        $model->image_gallery = ['1000' => 'test'];
+        $model->image_gallery = ['files' => ['1000' => 'test']];
         $model->save();
 
         $this->assertCount(0, $model->getFiles('image_gallery'));
@@ -144,7 +172,11 @@ public function testSaveNotTmpGallery()
             'saveAfterUpload' => true
         ]);
 
-        $model->image_gallery = [$response['id'] => 'test'];
+        $model->image_gallery = ['files' => [
+            $files[0]->id => 'test2',
+            $response['id'] => 'test'
+        ]];
+
         $model->save();
 
         $this->assertCount(2, $model->getFiles('image_gallery'));
@@ -171,12 +203,11 @@ public function testFailSaveGallery()
         $file = File::findOne($response['id']);
         unlink($file->path(true));
 
-        $model->image_gallery = [$response['id'] => 'test'];
+        $model->image_gallery = ['files' => [$response['id'] => 'test']];
         $model->save();
 
         $files = $model->getFiles('image_gallery');
 
-        $this->assertCount(1, $files);
-        $this->assertTrue($files[0]->id === $oldFiles[0]->id);
+        $this->assertCount(0, $files);
     }
 }

tests/data/views/gallery-item.php

@@ -6,7 +6,7 @@
     <img src="<?= $model->thumb('image_gallery', '80x80', $file->path())?>">
   </a>
   <a class="btn btn-lg"><span class="glyphicon glyphicon-remove remove-item" data-remove-item="li"></span></a>
-  <?= Html::textInput(Html::getInputName($model, $attribute) . '[' . $file->id .']', $file->title, [
+  <?= Html::textInput(Html::getInputName($model, $attribute) . '[files][' . $file->id .']', $file->title, [
       'class' => 'form-control',
   ])?>
 </li>