Commit 54ada04aa221b9ea15f6597006ed90a6f440590a
1 parent
2509e17e
add base classes od AR and Controller
Showing
5 changed files
with
36 additions
and
6 deletions
Show diff stats
backend/controllers/ParserController.php
... | ... | @@ -3,7 +3,7 @@ namespace backend\controllers; |
3 | 3 | |
4 | 4 | use Yii; |
5 | 5 | use yii\filters\AccessControl; |
6 | -use yii\web\Controller; | |
6 | +use backend\components\base\BaseController; | |
7 | 7 | use yii\filters\VerbFilter; |
8 | 8 | use backend\models\UploadFileParsingForm; |
9 | 9 | use yii\web\UploadedFile; |
... | ... | @@ -15,7 +15,7 @@ use common\components\debug\CustomVarDamp; |
15 | 15 | * Parser controller |
16 | 16 | */ |
17 | 17 | |
18 | -class ParserController extends Controller | |
18 | +class ParserController extends BaseController | |
19 | 19 | { |
20 | 20 | public $layout = "/column"; |
21 | 21 | /** |
... | ... | @@ -75,10 +75,9 @@ class ParserController extends Controller |
75 | 75 | $filePath = Yii::getAlias('@webroot') . '/uploads/' . $model->file->baseName . '.' . $model->file->extension; |
76 | 76 | |
77 | 77 | $model->file->saveAs( $filePath ); |
78 | - | |
79 | 78 | $data = $model->readFile($filePath); |
80 | 79 | |
81 | - Yii::$app->getCache()->set( 'parser_data', json_encode($data),200 ); | |
80 | + Yii::$app->getCache()->set( 'parser_data', json_encode($data), 200 ); | |
82 | 81 | |
83 | 82 | $provider = new ArrayDataProvider([ |
84 | 83 | 'allModels' => $data, | ... | ... |
backend/controllers/SiteController.php
... | ... | @@ -3,14 +3,14 @@ namespace backend\controllers; |
3 | 3 | |
4 | 4 | use Yii; |
5 | 5 | use yii\filters\AccessControl; |
6 | -use yii\web\Controller; | |
6 | +use backend\components\base\BaseController; | |
7 | 7 | use common\models\LoginForm; |
8 | 8 | use yii\filters\VerbFilter; |
9 | 9 | |
10 | 10 | /** |
11 | 11 | * Site controller |
12 | 12 | */ |
13 | -class SiteController extends Controller | |
13 | +class SiteController extends BaseController | |
14 | 14 | { |
15 | 15 | |
16 | 16 | public $layout = '/column'; | ... | ... |
backend/views/parser/results.php
... | ... | @@ -21,4 +21,6 @@ $this->params['breadcrumbs'][] = $this->title; |
21 | 21 | 'dataProvider' => $dataProvider, |
22 | 22 | ]); ?> |
23 | 23 | |
24 | + <?= Html::a('Вернуться', ['parser/index'], ['class' => 'btn btn-primary', 'name' => 'Return',]) ?> | |
25 | + | |
24 | 26 | </div> |
25 | 27 | \ No newline at end of file | ... | ... |