diff --git a/backend/assets/MyAsset.php b/backend/assets/MyAsset.php index 37f2caa..d55f6ef 100644 --- a/backend/assets/MyAsset.php +++ b/backend/assets/MyAsset.php @@ -32,21 +32,21 @@ class MyAsset extends AssetBundle ]; public $js = [ -// '//code.jquery.com/ui/1.11.4/jquery-ui.min.js', -// '//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js', -// 'css/plugins/sparkline/jquery.sparkline.min.js', -// 'css/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js', -// 'css/plugins/jvectormap/jquery-jvectormap-world-mill-en.js', -// 'css/plugins/knob/jquery.knob.js', -// '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js', -// 'css/plugins/daterangepicker/daterangepicker.js', -// 'css/plugins/datepicker/bootstrap-datepicker.js', -// 'css/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js', -// 'css/plugins/slimScroll/jquery.slimscroll.min.js', -// 'css/plugins/fastclick/fastclick.min.js', -// 'js/app.min.js', -// 'js/pages/dashboard.js', -// 'js/main.js', + '//code.jquery.com/ui/1.11.4/jquery-ui.min.js', + '//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js', + 'css/plugins/sparkline/jquery.sparkline.min.js', + 'css/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js', + 'css/plugins/jvectormap/jquery-jvectormap-world-mill-en.js', + 'css/plugins/knob/jquery.knob.js', + '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js', + 'css/plugins/daterangepicker/daterangepicker.js', + 'css/plugins/datepicker/bootstrap-datepicker.js', + 'css/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js', + 'css/plugins/slimScroll/jquery.slimscroll.min.js', + 'css/plugins/fastclick/fastclick.min.js', + 'js/app.min.js', + 'js/pages/dashboard.js', + 'js/main.js', ]; public $depends = [ diff --git a/backend/controllers/ParserController.php b/backend/controllers/ParserController.php index 6a36cc1..f6f2b65 100644 --- a/backend/controllers/ParserController.php +++ b/backend/controllers/ParserController.php @@ -5,7 +5,7 @@ use Yii; use yii\filters\AccessControl; use yii\web\Controller; use yii\filters\VerbFilter; -use app\models\UploadFileParsingForm; +use backend\models\UploadFileParsingForm; use yii\web\UploadedFile; use yii\data\ArrayDataProvider; use app\components\parsers\ParserHandler; @@ -54,9 +54,11 @@ class ParserController extends Controller public function actionIndex() { + Yii::$app->controller->enableCsrfValidation = false; $model = new UploadFileParsingForm(); if (Yii::$app->request->isPost) { + $model->file = UploadedFile::getInstance($model, 'file'); if ($model->file && $model->validate()) { diff --git a/backend/models/UploadFileParsingForm.php b/backend/models/UploadFileParsingForm.php index c4a5ea4..2f1352d 100644 --- a/backend/models/UploadFileParsingForm.php +++ b/backend/models/UploadFileParsingForm.php @@ -1,5 +1,5 @@ beginPage() ?> -- libgit2 0.21.4