Fix watchers field

hiqdev · May 19, 2015 · f41eb95 · f41eb95
1 parent 29caf62
commit f41eb95
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/models/Thread.php b/models/Thread.php
@@ -245,8 +245,8 @@ public function prepareTopic()
 
     public function afterFind()
     {
-        // if (is_array($this->topics)) $this->topics = array_keys($this->topics);
-        if (is_array($this->watchers)) $this->watchers = array_keys($this->watchers);
+//        if (is_array($this->topics)) $this->topics = array_keys($this->topics);
+//        if (is_array($this->watchers)) $this->watchers = array_keys($this->watchers);
 
         parent::afterFind();
     }

diff --git a/views/ticket/_advanced_form.php b/views/ticket/_advanced_form.php
@@ -58,6 +58,18 @@
             ],
         ],
     ]); ?>
+<?php else : ?>
+    <?= $form->field($model, 'watchers')->widget(ClientCombo::classname(), [
+//        'clientType' => 'manager',
+        'inputOptions' => [
+            'value' => implode(',', array_keys($model->watchers)),
+        ],
+        'pluginOptions' => [
+            'select2Options' => [
+                'multiple' => true,
+            ],
+        ],
+    ]); ?>
 <?php endif; ?>
 
 <?php

diff --git a/views/ticket/_leftBlock.php b/views/ticket/_leftBlock.php
@@ -92,7 +92,7 @@
             </div>
         <?php endif; ?>
         <?php $box->beginFooter(); ?>
-        <?php if (is_array($model->watchers) && in_array(Yii::$app->user->identity->id, $model->watchers)) : ?>
+        <?php if (is_array($model->watchers) && array_keys(Yii::$app->user->identity->id, $model->watchers)) : ?>
             <?= Html::a('<i class="fa fa-eye-slash"></i>&nbsp;&nbsp;' . Yii::t('app', 'Unsubscribe'), ['unsubscribe', 'id' => $model->id], ['class' => 'btn  btn-default btn-block']) ?>
         <?php else : ?>
             <?= Html::a('<i class="fa fa-eye"></i>&nbsp;&nbsp;' . Yii::t('app', 'Subscribe'), ['subscribe', 'id' => $model->id], ['class' => 'btn  btn-default btn-block']) ?>