AntonLV 2 роки тому
батько
коміт
bccc8b7e89

+ 4 - 4
inc/classes/BxDolAI.php

@@ -110,16 +110,16 @@ class BxDolAI extends BxDolFactory implements iBxDolSingleton
 
         return $aAutomator;
     }
-    
+
     public function getAutomatorInstruction($sType, $aParams = [])
     {
         $mixedResult = '';
 
-        switch($sType){
+        switch($sType) {
             case 'providers':
                 $aProviders = $this->_oDb->getProviderBy(['sample' => 'ids', 'ids' => $aParams]);
                 if(!empty($aProviders) && is_array($aProviders)) {
-                    $mixedResult = "avaliable proividers list:";
+                    $mixedResult = "\n avaliable proividers list:";
                     foreach($aProviders as $aProvider)
                         $mixedResult .= "\n- " . $aProvider['provider_name'] . ", \$iProviderId=" . $aProvider['id'];
                 }
@@ -128,7 +128,7 @@ class BxDolAI extends BxDolFactory implements iBxDolSingleton
 
         return $mixedResult;
     }
-    
+
     public function getAutomatorsEvent($sUnit, $sAction)
     {
         if(in_array($sUnit, $this->_aExcludeAlertUnits))

+ 8 - 0
inc/classes/BxDolAIQuery.php

@@ -230,6 +230,14 @@ class BxDolAIQuery extends BxDolDb
                 $aMethod['name'] = 'getPairs';
                 $aMethod['params'][1] = 'id';
                 $aMethod['params'][2] = 'title';
+
+                if(isset($aParams['active'])) {
+                    $aMethod['params'][3] = [
+                        'active' => $aParams['active']
+                    ];
+
+                    $sWhereClause = " AND `active`=:active";
+                }
                 break;
         }
 

+ 5 - 0
studio/classes/BxDolStudioAgentsAutomatorsCmts.php

@@ -246,6 +246,11 @@ class BxDolStudioAgentsAutomatorsCmts extends BxTemplCmts
         $aResult->aInputs['cmt_text']['db']['pass'] = 'xss';
         return $aResult;
     }
+    
+    protected function _prepareTextForOutput($s, $iCmtId = 0)
+    {
+        return nl2br(parent::_prepareTextForOutput($s, $iCmtId));
+    }
 }
 
 /** @} */

+ 1 - 1
studio/template/scripts/BxBaseStudioAgentsProviders.php

@@ -237,7 +237,7 @@ class BxBaseStudioAgentsProviders extends BxDolStudioAgentsProviders
                     'value' => isset($aProvider['type_id']) ? $aProvider['type_id'] : 0,
                     'values' => array_map(function($sTitle) {
                         return _t($sTitle);
-                    }, ['' => '_sys_please_select'] + $this->_oDb->getProviderTypesBy(['sample' => 'all_pairs'])),
+                    }, ['' => '_sys_please_select'] + $this->_oDb->getProviderTypesBy(['sample' => 'all_pairs', 'active' => 1])),
                     'required' => '1',
                     'db' => [
                         'pass' => 'Int',