Ticket #715 - Studio builders.

install/sql/system.sql

@@ -3519,11 +3519,10 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 
 ('sys_studio_search_forms_fields', 'order', '', '1%', 0, '', '', 1),
 ('sys_studio_search_forms_fields', 'switcher', '', '9%', 0, '', '', 2),
-('sys_studio_search_forms_fields', 'type', '_adm_form_txt_search_forms_fields_type', '10%', 0, '', '', 3),
+('sys_studio_search_forms_fields', 'type', '_adm_form_txt_search_forms_fields_type', '15%', 0, '', '', 3),
 ('sys_studio_search_forms_fields', 'caption', '_adm_form_txt_search_forms_fields_caption', '40%', 1, '38', '', 4),
-('sys_studio_search_forms_fields', 'search_type', '_adm_form_txt_search_forms_fields_search_type', '10%', 0, '', '', 5),
-('sys_studio_search_forms_fields', 'search_operator', '_adm_form_txt_search_forms_fields_search_operator', '10%', 0, '', '', 6),
-('sys_studio_search_forms_fields', 'actions', '', '20%', 0, '', '', 7);
+('sys_studio_search_forms_fields', 'search_type', '_adm_form_txt_search_forms_fields_search_type', '15%', 0, '', '', 5),
+('sys_studio_search_forms_fields', 'actions', '', '20%', 0, '', '', 6);
 
 
 CREATE TABLE IF NOT EXISTS `sys_grid_actions` (

modules/boonex/english/data/langs/system/en.xml

@@ -874,7 +874,6 @@
     <string name="_adm_form_txt_search_forms_fields_type"><![CDATA[Type]]></string>
     <string name="_adm_form_txt_search_forms_fields_caption"><![CDATA[Caption]]></string>
     <string name="_adm_form_txt_search_forms_fields_search_type"><![CDATA[Search Type]]></string>
-    <string name="_adm_form_txt_search_forms_fields_search_operator"><![CDATA[Search Operator]]></string>
     <string name="_adm_form_txt_search_forms_fields_select_object"><![CDATA[Select Form...]]></string>
     <string name="_adm_form_txt_search_forms_fields_edit_popup"><![CDATA[Edit "{0}" Search Field]]></string>
     <string name="_adm_form_txt_search_forms_manage_fields"><![CDATA[Manage fields]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -872,7 +872,6 @@
     <string name="_adm_form_txt_search_forms_fields_type"><![CDATA[Тип]]></string>
     <string name="_adm_form_txt_search_forms_fields_caption"><![CDATA[Заголовок]]></string>
     <string name="_adm_form_txt_search_forms_fields_search_type"><![CDATA[Тип поиска]]></string>
-    <string name="_adm_form_txt_search_forms_fields_search_operator"><![CDATA[Оператор поиска]]></string>
     <string name="_adm_form_txt_search_forms_fields_select_object"><![CDATA[Выбрать форму...]]></string>
     <string name="_adm_form_txt_search_forms_fields_edit_popup"><![CDATA[Редактировать "{0}" поле формы поиска]]></string>
     <string name="_adm_form_txt_search_forms_manage_fields"><![CDATA[Управление полями]]></string>

studio/template/scripts/BxBaseStudioFormsSearchFields.php

@@ -235,6 +235,10 @@ class BxBaseStudioFormsSearchFields extends BxDolStudioFormsSearchFields
         if($sType == 'single' && !$this->_isEditable($aRow))
             return '';
 
+        $aSearchTypes = BxDolSearchExtended::$TYPE_TO_TYPE_SEARCH[$aRow['type']];
+        if(!is_array($aSearchTypes) || count($aSearchTypes) < 2)
+    	    return '';
+
         return  parent::_getActionDefault($sType, $sKey, $a, false, $isDisabled, $aRow);
     }