fix

yupe · Jun 13, 2016 · 54368ca · 54368ca
1 parent 5d3320e
commit 54368ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/protected/modules/install/views/layouts/column2.php b/protected/modules/install/views/layouts/column2.php
@@ -1,5 +1,5 @@
 <?php $installAssets = Yii::app()->getAssetManager()->publish(Yii::getPathOfAlias('application.modules.install.views.assets')); ?>
-<?php $this->beginContent(Yii::app()->controller->module->getLayoutAlias()); ?>
+<?php $this->beginContent(Yii::app())->getController()->getModule()->getLayoutAlias()); ?>
 <div class="row">
     <div class="col-sm-9 well">
         <?php if (count($this->breadcrumbs)) {
@@ -11,19 +11,22 @@
         </div>
     </div>
     <div class="col-sm-3">
+        <div>
+            <a class="btn btn-green banner-width" target="_blank" href="http://yupe.ru/make-world-better?from=install">Сказать спасибо!</a>
+        </div>
         <div>
             <?php
             $this->widget(
                 'bootstrap.widgets.TbMenu',
                 [
                     'type' => 'list',
-                    'items' => Yii::app()->controller->module->getInstallMenu(),
+                    'items' => Yii::app()->getController()->getModule()->getInstallMenu(),
                     'htmlOptions' => ['class' => 'well'],
                 ]
             ); ?>
         </div>
         <div>
-            <iframe src="http://yupe.ru/info/install?version=<?= $this->yupe->getVersion();?>&lang=<?= Yii::app()->language;?>" scrolling="no" id="yupestore"></iframe>
+            <iframe src="http://yupe.ru/info/install?version=<?= $this->yupe->getVersion();?>&lang=<?= Yii::app()->getLanguage();?>" scrolling="no" id="yupestore"></iframe>
         </div>
     </div>
 </div>

diff --git a/protected/modules/store/components/AttributeRender.php b/protected/modules/store/components/AttributeRender.php
@@ -71,7 +71,10 @@ public static function renderValue(Attribute $attribute, $value, $template = '<p
                 break;
             case Attribute::TYPE_DROPDOWN:
                 $data = CHtml::listData($attribute->options, 'id', 'value');
-                if (!is_array($value) && isset($data[$value])) {
+                if(is_array($value)) {
+                    $value = array_shift($value);
+                }
+                if (isset($data[$value])) {
                     $res .= $data[$value];
                 }
                 break;