Merge remote-tracking branch 'origin/master'

Eugeny Galkovskiy
2 parents 03fe2bc0 7cbad932
Showing 4 changed files with 12 additions and 5 deletions Show diff stats
common/models/Objectkb.php
frontend/controllers/ObjectController.php
frontend/views/object/index.php
frontend/views/site/legal.php
@@ -8,11 +8,18 @@
     use Yii;
     /**
-     * Created by PhpStorm.
      * User: timur
      * Date: 25.01.18
      * Time: 12:46
      */
+
+    /**
+     * Class Objectkb
+     *
+     * @package common\models
+     * @property \common\models\ObjectkbLang $lang
+     *
+     */
     class Objectkb extends ActiveRecord
     {
         /**
@@ -22,7 +22,7 @@
                                ->with("lang.alias")
                                ->with("image")
                                ->all();
-        
+            
             return $this->render(
                 'index',
                 [
@@ -65,7 +65,7 @@
                                                         ]
                                                     ) ?>"
                                                 >
-                                                    Фото в портфолио
+                                                    <?=$object->lang->object_name?>
                                                 </a>
                                             </h3>
                                         </div>
@@ -15,8 +15,8 @@ use yii\web\View;
 MapAsset::register($this);
 $settings = Settings::getInstance();
-$this->title = \Yii::t('app', 'menu-legal');
-$this->params[ 'breadcrumbs' ][] = $this->title;
+$this->params['h1'] = \Yii::t('app', 'menu-legal');
+$this->params[ 'breadcrumbs' ][] = $this->params['h1'];
 $js = <<< JS
 window.lat = {$settings->lat};