From f020676cb1f3cd5af6b1e2e944004cb3a1b0fe1d Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 5 Nov 2015 17:44:17 +0200 Subject: [PATCH] Fixing issues --- backend/config/.gitignore | 4 ++-- backend/config/main.php | 7 ++++++- backend/controllers/ImageController.php | 1 - backend/models/UploadForm.php | 3 +-- backend/views/image/index.php | 13 +++++++++---- backend/web/.gitignore | 4 ++-- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/backend/config/.gitignore b/backend/config/.gitignore index 20da318..0ab1e53 100644 --- a/backend/config/.gitignore +++ b/backend/config/.gitignore @@ -1,2 +1,2 @@ -main-local.php -params-local.php \ No newline at end of file +#main-local.php +#params-local.php \ No newline at end of file diff --git a/backend/config/main.php b/backend/config/main.php index 4b88e97..6d07d50 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -11,7 +11,6 @@ return [ 'basePath' => dirname(__DIR__), 'controllerNamespace' => 'backend\controllers', 'bootstrap' => ['log'], - 'modules' => [], 'components' => [ 'imagine' => 'Imagine\Gd\Imagine', 'user' => [ @@ -31,5 +30,11 @@ return [ 'errorAction' => 'site/error', ], ], + 'modules' => [ + 'debug' => [ + 'class' => 'yii\debug\Module', + 'allowedIPs' => ['77.47.190.198', '::1'] + ] + ], 'params' => $params, ]; diff --git a/backend/controllers/ImageController.php b/backend/controllers/ImageController.php index 0d0e9c0..5284593 100644 --- a/backend/controllers/ImageController.php +++ b/backend/controllers/ImageController.php @@ -28,7 +28,6 @@ class ImageController extends Controller if ($request->isPost) { $model->imageFiles = UploadedFile::getInstances($model, 'imageFiles'); $crop_id = $request->post('crop_id'); - print_r($crop_id); $model->upload($ukrSeeds[$crop_id]); $cropFactory = CropFactory::getInstance(); diff --git a/backend/models/UploadForm.php b/backend/models/UploadForm.php index 365b918..24b1347 100644 --- a/backend/models/UploadForm.php +++ b/backend/models/UploadForm.php @@ -12,8 +12,7 @@ class UploadForm extends Model public function rules() { return [ - [['imageFiles'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg', 'maxFiles' => 20], - + [['imageFiles'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg', 'maxFiles' => 20] ]; } diff --git a/backend/views/image/index.php b/backend/views/image/index.php index 590760d..6289b2e 100644 --- a/backend/views/image/index.php +++ b/backend/views/image/index.php @@ -10,10 +10,15 @@ $this->title = 'Image cropper'; ['enctype'=>'multipart/form-data']]); ?> 'ukr_seeds']) ?> -field($model, 'imageFiles[]')->widget(FileInput::classname(), [ - 'options' => ['accept' => 'image/*', 'multiple' => true], - 'language' => 'ru' - ]); ?> + 'imageFiles[]', + 'language' => 'ru', + 'options' => ['multiple' => true, 'accept' => 'image/*'], + 'pluginOptions' => [ + 'previewFileType' => 'image', + 'maxFileCount' => 20 + ] +]); ?> end(); ?> 'js:draw();', 'style' => 'display : block']) ?> diff --git a/backend/web/.gitignore b/backend/web/.gitignore index 25c74e6..1faed06 100644 --- a/backend/web/.gitignore +++ b/backend/web/.gitignore @@ -1,2 +1,2 @@ -/index.php -/index-test.php +#/index.php +#/index-test.php -- libgit2 0.21.4