From 75ea156491d6cd4508d4d8be6708e52ecaae08cb Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 5 Nov 2015 12:35:09 +0200 Subject: [PATCH] Adding deletion capability --- backend/controllers/ImageController.php | 8 ++++++-- backend/models/UploadForm.php | 2 +- backend/views/image/index.php | 4 ++-- backend/web/.gitignore | 4 ++-- backend/web/js/main.js | 7 +++---- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/backend/controllers/ImageController.php b/backend/controllers/ImageController.php index 0dcf675..0d0e9c0 100644 --- a/backend/controllers/ImageController.php +++ b/backend/controllers/ImageController.php @@ -14,6 +14,11 @@ use yii\web\UploadedFile; class ImageController extends Controller { + public function beforeAction($action) { + $this->enableCsrfValidation = false; + return parent::beforeAction($action); + } + public function actionIndex() { $request = Yii::$app->request; @@ -22,9 +27,8 @@ 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 2b36f1d..365b918 100644 --- a/backend/models/UploadForm.php +++ b/backend/models/UploadForm.php @@ -4,7 +4,6 @@ namespace backend\models; use backend\components\Helper; use yii\base\Model; use yii\helpers\FileHelper; -use yii\web\UploadedFile; class UploadForm extends Model { @@ -30,6 +29,7 @@ class UploadForm extends Model $path = $basePath . $nameDir . '/' . Helper::transliterate($file->name); $file->saveAs($path); } + print_r($this->imageFiles, 1); return true; } else { return false; diff --git a/backend/views/image/index.php b/backend/views/image/index.php index 63a1dff..590760d 100644 --- a/backend/views/image/index.php +++ b/backend/views/image/index.php @@ -9,11 +9,11 @@ $this->title = 'Image cropper'; ?> ['enctype'=>'multipart/form-data']]); ?> - field($model, 'imageFiles[]')->widget(FileInput::classname(), [ + 'ukr_seeds']) ?> +field($model, 'imageFiles[]')->widget(FileInput::classname(), [ 'options' => ['accept' => 'image/*', 'multiple' => true], 'language' => 'ru' ]); ?> - 'ukr_seeds']) ?> 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 diff --git a/backend/web/js/main.js b/backend/web/js/main.js index 726785d..33be5cb 100644 --- a/backend/web/js/main.js +++ b/backend/web/js/main.js @@ -1,10 +1,9 @@ var canvas = $('canvas') .attr({'width' : 1200, 'height' : 500}) - .css('border', '1px solid black') - .get(0); + .css('border', '1px solid black'); -if(canvas) - var context = canvas.getContext('2d'); +if(canvas.get(0)) + var context = canvas.get(0).getContext('2d'); var model = { width : 0, -- libgit2 0.21.4