Слияние с develop

diff --cc .gitignore
index fc42644,5bd9be8..806fcaf
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -30,7 -30,4 +30,8 @@@ tests/_output/
  tests/_support/_generated
  
  #vagrant folder
 -/.vagrant
 +/.vagrant
 +
 +# Assets
- /web/assets
++/web/assets
++/runtime

diff --cc config/web.php
index 524bea4,6902695..6c05664
--- 1/config/web.php
--- 2/config/web.php
+++ b/config/web.php
@@@ -71,14 -71,6 +71,17 @@@ $config = 
                          'app' => 'types.app',
                      ],
                  ],
++<<<<<<< HEAD
 +                'status*' => [
 +                    'class' => 'yii\i18n\PhpMessageSource',
 +                    'sourceLanguage' => 'en-US',
 +                    'basePath' => '@app/messages',
 +                    'fileMap' => [
 +                        'app' => 'status.app',
 +                    ],
 +                ],
++=======
++>>>>>>> develop
                  'contact*' => [
                      'class' => 'yii\i18n\PhpMessageSource',
                      'sourceLanguage' => 'en-US',

diff --cc models/Items.php
index 7e3ae74,eeb26f0..28c7b29
--- 1/models/Items.php
--- 2/models/Items.php
+++ b/models/Items.php
@@@ -64,7 -64,7 +64,11 @@@ class Items extends \yii\db\ActiveRecor
              'state_id' => Yii::t('items', "Состояние"),
              'statusName' => Yii::t('items', "State"),
              'type_id' => Yii::t('items', "Тип оборудования"),
++<<<<<<< HEAD
 +            'typeName' => Yii::t('items', "Type of item"),
++=======
+             'typeName' => Yii::t('items', "Type of item")
++>>>>>>> develop
          ];
      }
      
@@@ -73,10 -72,9 +77,17 @@@
      {
          return $this->hasOne(Status::className(), ['id' => 'state_id']);
      }
++<<<<<<< HEAD
 +    
 +    // Получение типа оборудования
 +    public function getTypes()
 +    {
 +        return $this->hasOne(Types::className(), ['id' => 'type_id']);
++=======
+ 
+     public function getType()
+     {
+         return $this->hasOne(Type::className(), ['id' => 'type_id']);
++>>>>>>> develop
      }
  }

diff --cc models/ItemsSearch.php
index 0d3216c,0382769..642952d
--- 1/models/ItemsSearch.php
--- 2/models/ItemsSearch.php
+++ b/models/ItemsSearch.php
@@@ -51,18 -50,18 +51,26 @@@ class ItemsSearch extends Item
          ]);
  
          $dataProvider->sort->attributes['statusName'] = [
 -            'asc' => [Status::tableName().'.name' => SORT_ASC],
 -            'desc' => [Status::tableName().'.name' => SORT_DESC],
 +            'asc' => [Status::className().'.name' => SORT_ASC],
 +            'desc' => [Status::className().'.name' => SORT_DESC],
 +        ];
 +        $dataProvider->sort->attributes['typeName'] = [
 +            'asc' => [Types::className().'.name' => SORT_ASC],
 +            'desc' => [Types::className().'.name' => SORT_DESC],
          ];
+         $dataProvider->sort->attributes['typeName'] = [
+             'asc' => [Types::tableName().'.name' => SORT_ASC],
+             'desc' => [Types::tableName().'.name' => SORT_DESC],
+         ];
          
          $dataProvider->setSort([
              'defaultOrder' => [
                  'id' => SORT_ASC,
++<<<<<<< HEAD
 +            ],
++=======
+             ]
++>>>>>>> develop
          ]);
          $this->load($params);