Commit 54a26acc22bf28ad44dbffdd338e84324284f4cf

Authored by alex
1 parent 5f2d1ae9

Поменял везде AliasableTrait на свой. Исправил баг, что нельзя было в врачах выбрать картингку

backend/controllers/DoctorController.php
@@ -150,10 +150,12 @@ @@ -150,10 +150,12 @@
150 150
151 protected static function fieldsConfig() 151 protected static function fieldsConfig()
152 { 152 {
153 - return [ 153 +
  154 + return [
154 'model' => Doctor::className(), 155 'model' => Doctor::className(),
155 'hasAlias' => true, 156 'hasAlias' => true,
156 - 'languageFields' => [ 157 +
  158 + 'languageFields' => [
157 [ 159 [
158 'name' => 'name', 160 'name' => 'name',
159 'type' => Form::STRING, 161 'type' => Form::STRING,
common/models/Doctor.php
@@ -68,7 +68,7 @@ class Doctor extends \yii\db\ActiveRecord @@ -68,7 +68,7 @@ class Doctor extends \yii\db\ActiveRecord
68 { 68 {
69 return [ 69 return [
70 [['service_id', 'sort'], 'default', 'value' => null], 70 [['service_id', 'sort'], 'default', 'value' => null],
71 - [['service_id', 'sort'], 'integer'], 71 + [['service_id', 'sort', 'image_id'], 'integer'],
72 [['status'], 'boolean'], 72 [['status'], 'boolean'],
73 [['service_id'], 'exist', 'skipOnError' => true, 'targetClass' => Service::className(), 'targetAttribute' => ['service_id' => 'id']], 73 [['service_id'], 'exist', 'skipOnError' => true, 'targetClass' => Service::className(), 'targetAttribute' => ['service_id' => 'id']],
74 ]; 74 ];
common/models/Package.php
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 namespace common\models; 3 namespace common\models;
4 4
5 use artbox\core\models\Image; 5 use artbox\core\models\Image;
6 -use artbox\core\models\traits\AliasableTrait; 6 +use backend\traits\AliasableTrait;
7 use Yii; 7 use Yii;
8 use artbox\core\models\Language; 8 use artbox\core\models\Language;
9 use yii\behaviors\TimestampBehavior; 9 use yii\behaviors\TimestampBehavior;
common/models/Service.php
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 2
3 namespace common\models; 3 namespace common\models;
4 4
5 -use artbox\core\models\Alias; 5 +
6 use artbox\core\models\Image; 6 use artbox\core\models\Image;
7 -use artbox\core\models\traits\AliasableTrait; 7 +use backend\traits\AliasableTrait;
8 use backend\behaviors\LevelBehavior; 8 use backend\behaviors\LevelBehavior;
9 use Yii; 9 use Yii;
10 use artbox\core\models\Language; 10 use artbox\core\models\Language;
common/models/blog/Article.php
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 namespace common\models\blog; 3 namespace common\models\blog;
4 4
5 use artbox\core\models\Image; 5 use artbox\core\models\Image;
6 - use artbox\core\models\traits\AliasableTrait; 6 + use backend\traits\AliasableTrait;
7 use common\models\Comment; 7 use common\models\Comment;
8 use yii\behaviors\TimestampBehavior; 8 use yii\behaviors\TimestampBehavior;
9 use yii\db\ActiveRecord; 9 use yii\db\ActiveRecord;
common/models/blog/Category.php
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 namespace common\models\blog; 3 namespace common\models\blog;
4 4
5 use artbox\core\models\Image; 5 use artbox\core\models\Image;
6 - use artbox\core\models\traits\AliasableTrait; 6 + use backend\traits\AliasableTrait;
7 use yii\db\ActiveQuery; 7 use yii\db\ActiveQuery;
8 use yii\db\ActiveRecord; 8 use yii\db\ActiveRecord;
9 use artbox\core\models\Language; 9 use artbox\core\models\Language;
common/models/blog/Tag.php
1 <?php 1 <?php
2 2
3 namespace common\models\blog; 3 namespace common\models\blog;
4 -  
5 - use artbox\core\models\traits\AliasableTrait; 4 +
  5 + use backend\traits\AliasableTrait;
6 use yii\db\ActiveRecord; 6 use yii\db\ActiveRecord;
7 use artbox\core\models\Language; 7 use artbox\core\models\Language;
8 use yii\db\ActiveQuery; 8 use yii\db\ActiveQuery;
common/models/page/Page.php
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 use artbox\core\behaviors\GalleryBehavior; 5 use artbox\core\behaviors\GalleryBehavior;
6 use artbox\core\models\Image; 6 use artbox\core\models\Image;
7 use artbox\core\models\Language; 7 use artbox\core\models\Language;
8 - use artbox\core\models\traits\AliasableTrait; 8 + use backend\traits\AliasableTrait;
9 use yii\behaviors\TimestampBehavior; 9 use yii\behaviors\TimestampBehavior;
10 use yii\db\ActiveQuery; 10 use yii\db\ActiveQuery;
11 use yii\db\ActiveRecord; 11 use yii\db\ActiveRecord;
frontend/web/css/newStyle.css 0 → 100644