Commit 94be54ab636239a72d6f20214bab5cee6beab2ef
1 parent
4380a807
admin add
Showing
4 changed files
with
21 additions
and
19 deletions
Show diff stats
backend/assets/MyAsset.php
@@ -32,21 +32,21 @@ class MyAsset extends AssetBundle | @@ -32,21 +32,21 @@ class MyAsset extends AssetBundle | ||
32 | 32 | ||
33 | ]; | 33 | ]; |
34 | public $js = [ | 34 | public $js = [ |
35 | -// '//code.jquery.com/ui/1.11.4/jquery-ui.min.js', | ||
36 | -// '//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js', | ||
37 | -// 'css/plugins/sparkline/jquery.sparkline.min.js', | ||
38 | -// 'css/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js', | ||
39 | -// 'css/plugins/jvectormap/jquery-jvectormap-world-mill-en.js', | ||
40 | -// 'css/plugins/knob/jquery.knob.js', | ||
41 | -// '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js', | ||
42 | -// 'css/plugins/daterangepicker/daterangepicker.js', | ||
43 | -// 'css/plugins/datepicker/bootstrap-datepicker.js', | ||
44 | -// 'css/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js', | ||
45 | -// 'css/plugins/slimScroll/jquery.slimscroll.min.js', | ||
46 | -// 'css/plugins/fastclick/fastclick.min.js', | ||
47 | -// 'js/app.min.js', | ||
48 | -// 'js/pages/dashboard.js', | ||
49 | -// 'js/main.js', | 35 | + '//code.jquery.com/ui/1.11.4/jquery-ui.min.js', |
36 | + '//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js', | ||
37 | + 'css/plugins/sparkline/jquery.sparkline.min.js', | ||
38 | + 'css/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js', | ||
39 | + 'css/plugins/jvectormap/jquery-jvectormap-world-mill-en.js', | ||
40 | + 'css/plugins/knob/jquery.knob.js', | ||
41 | + '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js', | ||
42 | + 'css/plugins/daterangepicker/daterangepicker.js', | ||
43 | + 'css/plugins/datepicker/bootstrap-datepicker.js', | ||
44 | + 'css/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js', | ||
45 | + 'css/plugins/slimScroll/jquery.slimscroll.min.js', | ||
46 | + 'css/plugins/fastclick/fastclick.min.js', | ||
47 | + 'js/app.min.js', | ||
48 | + 'js/pages/dashboard.js', | ||
49 | + 'js/main.js', | ||
50 | 50 | ||
51 | ]; | 51 | ]; |
52 | public $depends = [ | 52 | public $depends = [ |
backend/controllers/ParserController.php
@@ -5,7 +5,7 @@ use Yii; | @@ -5,7 +5,7 @@ use Yii; | ||
5 | use yii\filters\AccessControl; | 5 | use yii\filters\AccessControl; |
6 | use yii\web\Controller; | 6 | use yii\web\Controller; |
7 | use yii\filters\VerbFilter; | 7 | use yii\filters\VerbFilter; |
8 | -use app\models\UploadFileParsingForm; | 8 | +use backend\models\UploadFileParsingForm; |
9 | use yii\web\UploadedFile; | 9 | use yii\web\UploadedFile; |
10 | use yii\data\ArrayDataProvider; | 10 | use yii\data\ArrayDataProvider; |
11 | use app\components\parsers\ParserHandler; | 11 | use app\components\parsers\ParserHandler; |
@@ -54,9 +54,11 @@ class ParserController extends Controller | @@ -54,9 +54,11 @@ class ParserController extends Controller | ||
54 | 54 | ||
55 | public function actionIndex() | 55 | public function actionIndex() |
56 | { | 56 | { |
57 | + Yii::$app->controller->enableCsrfValidation = false; | ||
57 | $model = new UploadFileParsingForm(); | 58 | $model = new UploadFileParsingForm(); |
58 | 59 | ||
59 | if (Yii::$app->request->isPost) { | 60 | if (Yii::$app->request->isPost) { |
61 | + | ||
60 | $model->file = UploadedFile::getInstance($model, 'file'); | 62 | $model->file = UploadedFile::getInstance($model, 'file'); |
61 | 63 | ||
62 | if ($model->file && $model->validate()) { | 64 | if ($model->file && $model->validate()) { |
backend/models/UploadFileParsingForm.php
backend/views/layouts/main.php
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | /* @var $this \yii\web\View */ | 3 | /* @var $this \yii\web\View */ |
4 | /* @var $content string */ | 4 | /* @var $content string */ |
5 | 5 | ||
6 | -use backend\assets\MyAsset; | 6 | +use backend\assets\AppAsset; |
7 | use yii\helpers\Html; | 7 | use yii\helpers\Html; |
8 | use yii\bootstrap\Nav; | 8 | use yii\bootstrap\Nav; |
9 | use yii\bootstrap\NavBar; | 9 | use yii\bootstrap\NavBar; |
@@ -11,7 +11,7 @@ use yii\widgets\Breadcrumbs; | @@ -11,7 +11,7 @@ use yii\widgets\Breadcrumbs; | ||
11 | use common\widgets\Alert; | 11 | use common\widgets\Alert; |
12 | use yii\widgets\Menu; | 12 | use yii\widgets\Menu; |
13 | 13 | ||
14 | -MyAsset::register($this); | 14 | +AppAsset::register($this); |
15 | ?> | 15 | ?> |
16 | <?php $this->beginPage() ?> | 16 | <?php $this->beginPage() ?> |
17 | <!DOCTYPE html> | 17 | <!DOCTYPE html> |