Aleksandr Trofimov 3 месяцев назад
Родитель
Сommit
d96723f462

+ 7 - 6
install/sql/system.sql

@@ -5874,12 +5874,13 @@ INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `fie
 ('sys_studio_agents_agents', 'Sql', 'SELECT * FROM `sys_agents_agents` WHERE 1 ', 'sys_agents_agents', 'id', 'added', 'active', '', 20, NULL, 'start', '', 'name', '', 'like', '', '', 'BxTemplStudioAgentsAgents', '');
 
 INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable`, `chars_limit`, `params`, `hidden_on`, `order`) VALUES
-('sys_studio_agents_agents', 'checkbox', '', '2%', 0, 0, '', '', 1),
-('sys_studio_agents_agents', 'switcher', '_sys_active', '8%', 0, 0, '', '', 2),
-('sys_studio_agents_agents', 'name', '_sys_agents_agents_txt_name', '10%', 0, 0, '', '', 3),
-('sys_studio_agents_agents', 'trigger', '_sys_agents_agents_txt_trigger', '8%', 0, 0, '', '', 4),
-('sys_studio_agents_agents', 'profile_id', '_sys_agents_agents_txt_profile_id', '10%', 0, 0, '', '', 6),
-('sys_studio_agents_agents', 'actions', '', '20%', 0, 0, '', '', 11);
+('sys_studio_agents_agents', 'checkbox', '', '2%', 0, 0, '', '', 10),
+('sys_studio_agents_agents', 'switcher', '_sys_active', '5%', 0, 0, '', '', 20),
+('sys_studio_agents_agents', 'model_id', '_sys_agents_agents_txt_model', '5%', 0, 0, '', '', 30),
+('sys_studio_agents_agents', 'name', '_sys_agents_agents_txt_name', '30%', 0, 0, '', '', 40),
+('sys_studio_agents_agents', 'trigger', '_sys_agents_agents_txt_trigger', '5%', 0, 0, '', '', 50),
+('sys_studio_agents_agents', 'profile_id', '_sys_agents_agents_txt_profile_id', '8%', 0, 0, '', '', 60),
+('sys_studio_agents_agents', 'actions', '', '45%', 0, 0, '', '', 70);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('sys_studio_agents_agents', 'bulk', 'delete', '_Delete', '', 0, 1, 1),

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -2288,6 +2288,7 @@
     <string name="_sys_agents_automators_txt_added"><![CDATA[Added]]></string>
     <string name="_sys_agents_automators_txt_status"><![CDATA[Status]]></string>
     <string name="_sys_agents_agents_txt_name"><![CDATA[Name]]></string>
+    <string name="_sys_agents_agents_txt_model"><![CDATA[Model]]></string>
     <string name="_sys_agents_agents_txt_trigger"><![CDATA[Trigger]]></string>
     <string name="_sys_agents_agents_txt_profile_id"><![CDATA[Profile]]></string>
     <string name="_sys_agents_agents_popup_add"><![CDATA[Add agent]]></string>

+ 1 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -2263,6 +2263,7 @@
         <string name="_sys_agents_automators_txt_added"><![CDATA[Добавлено]]></string>
         <string name="_sys_agents_automators_txt_status"><![CDATA[Статус]]></string>
         <string name="_sys_agents_agents_txt_name"><![CDATA[Название]]></string>
+        <string name="_sys_agents_agents_txt_model"><![CDATA[Модель]]></string>
         <string name="_sys_agents_agents_txt_trigger"><![CDATA[Триггер]]></string>
         <string name="_sys_agents_agents_txt_profile_id"><![CDATA[Профиль]]></string>
         <string name="_sys_agents_agents_popup_add"><![CDATA[Добавить агента]]></string>

+ 30 - 1
studio/template/scripts/BxBaseStudioAgentsAgents.php

@@ -257,8 +257,37 @@ class BxBaseStudioAgentsAgents extends BxDolStudioAgentsAgents
         return parent::_getCellSwitcher ($mixedValue, $sKey, $aField, $aRow);
     }
 
-    protected function _getCellType($mixedValue, $sKey, $aField, $aRow)
+    protected function _getCellProfileId($mixedValue, $sKey, $aField, $aRow)
     {
+        $mixedValue = BxDolProfile::getInstanceMagic($mixedValue)->getUnit(0, ['template' => 'unit_wo_info']);
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+
+    protected function _getCellModelId($mixedValue, $sKey, $aField, $aRow)
+    {
+        $aModel = $this->_oDb->getModelsBy(['sample' => 'id', 'id' => $mixedValue]);
+        if(!empty($aModel) && is_array($aModel)) {
+            $mixedValue = $aModel['icon'];
+            if (strpos($mixedValue, '.svg') !== false)
+                $mixedValue = $this->_oTemplate->getIconContent($mixedValue);
+        } else {
+            $mixedValue = '';
+        }
+
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+
+    protected function _getCellTrigger($mixedValue, $sKey, $aField, $aRow)
+    {
+        $mixedValue = $this->_oTemplate->getIconContent('agt-trg-' . $mixedValue . '.svg');
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+
+    protected function _getCellName($mixedValue, $sKey, $aField, $aRow)
+    {
+        if (!empty($aRow['title']))
+            $mixedValue = $aRow['title'];
+
         return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
     }