Added include_subclients fielter

hiqdev · Jan 5, 2017 · efeb333 · efeb333
1 parent 7d07209
commit efeb333
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/src/controllers/PrepareController.php b/src/controllers/PrepareController.php
@@ -96,16 +96,28 @@ private function getClientTypes()
 
     private function getServerTypes()
     {
+        if (!Yii::getAlias('@server', false)) {
+            return [];
+        }
+
         return $this->getRefs('type,device', 'hipanel:server');
     }
 
     private function getServerStates()
     {
+        if (!Yii::getAlias('@server', false)) {
+            return [];
+        }
+
         return $this->getRefs('state,device', 'hipanel:server');
     }
 
     private function getDomainStates()
     {
+        if (!Yii::getAlias('@domain', false)) {
+            return [];
+        }
+
         return $this->getRefs('state,domain', 'hipanel:domain');
     }
 

diff --git a/src/forms/FiltersForm.php b/src/forms/FiltersForm.php
@@ -45,10 +45,12 @@ class FiltersForm extends Model
 
     public $language_in;
 
+    public $include_subclients;
+
     public function attributes()
     {
         return [
-            'client_in', 'client_state_in',
+            'client_in', 'client_state_in', 'include_subclients',
             'seller_in',
             'server_in', 'has_server', 'server_state_in', 'server_type_in',
             'server_switch_like', 'server_rack_like', 'server_pdu_like',
@@ -84,6 +86,7 @@ public function attributeLabels()
             'exclude_unsubscribed' => Yii::t('hipanel:mailing', 'Exclude unsubscribed'),
             'language_in' => Yii::t('hipanel:mailing', 'Languages'),
             'language_unknown' => Yii::t('hipanel:mailing', 'Language is unknown'),
+            'include_subclients' => Yii::t('hipanel:mailing', 'Include subclients')
         ];
     }
 }
diff --git a/src/messages/ru/hipanel:mailing.php b/src/messages/ru/hipanel:mailing.php
@@ -33,4 +33,5 @@
     'Set filters to start the mailing preparation' => 'Установить фильтры для начала подготовки рассылки',
     'Not set' => 'Не выбран',
     'Languages' => 'Языки',
+    'Include subclients' => 'Включить субклиентов'
 ];
diff --git a/src/views/prepare/_search.php b/src/views/prepare/_search.php
@@ -21,6 +21,10 @@
     ]) ?>
 </div>
 
+<div class="col-md-4 col-sm-6 col-xs-12">
+    <?= $search->field('include_subclients')->checkbox() ?>
+</div>
+
 <div class="col-md-4 col-sm-6 col-xs-12">
     <?= $search->field('client_in')->widget(ClientCombo::class, [
         'multiple' => true,
@@ -65,14 +69,6 @@
         ]) ?>
     </div>
 
-    <div class="col-md-4 col-sm-6 col-xs-12">
-        <?= $search->field('server_state_in')->widget(StaticCombo::class, [
-            'multiple' => true,
-            'hasId' => true,
-            'data' => $serverStates,
-        ]) ?>
-    </div>
-
     <div class="col-md-4 col-sm-6 col-xs-12">
         <?= $search->field('server_type_in')->widget(StaticCombo::class, [
             'multiple' => true,