Index: branches/unlabeled/unlabeled-1.5.2/core/units/config_search/config_search_config.php =================================================================== diff -u -N -r4254 -r5725 --- branches/unlabeled/unlabeled-1.5.2/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 4254) +++ branches/unlabeled/unlabeled-1.5.2/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 5725) @@ -16,10 +16,10 @@ Array( 'Mode' => hAFTER, 'Conditional' => false, - 'HookToPrefix' => 'cf', + 'HookToPrefix' => '#PARENT#', 'HookToSpecial' => '*', 'HookToEvent' => Array('OnAfterItemCreate', 'OnAfterItemUpdate'), - 'DoPrefix' => 'confs-cf', + 'DoPrefix' => '', 'DoSpecial' => '*', 'DoEvent' => 'OnCreateCustomField', ), @@ -41,7 +41,15 @@ 'IDField' => 'SearchConfigId', + 'TitleField' => 'FieldName', + 'TitlePresets' => Array( + 'default' => Array( 'new_status_labels' => Array('confs'=>'!la_title_Adding_ConfigSearch!'), + 'edit_status_labels' => Array('confs'=>'!la_title_Editing_ConfigSearch!'), + 'new_titlefield' => Array('confs'=>'!la_title_New_ConfigSearch!'), + ), + + 'configsearch_edit' => Array('prefixes' => Array('confs'), 'format' => "#confs_status# '#confs_titlefield#' - !la_title_General!"), 'config_list_search' => Array('prefixes' => Array('confs_List'), 'tag_params' => Array('confs' => Array('per_page' => -1) ), 'format' => "!la_updating_config!"), ), @@ -60,25 +68,25 @@ 'Fields' => Array( - 'TableName' => Array('type' => 'string','not_null' => '1','default' => ''), - 'FieldName' => Array('type' => 'string','not_null' => '1','default' => ''), - 'SimpleSearch' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'AdvancedSearch' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'TableName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), + 'FieldName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), + 'SimpleSearch' => Array('type' => 'int','not_null' => '1','default' => '1'), + 'AdvancedSearch' => Array('type' => 'int','not_null' => '1','default' => '1'), 'Description' => Array('type' => 'string','default' => ''), - 'DisplayName' => Array('type' => 'string','default' => ''), - 'ModuleName' => Array('type' => 'string','default' => ''), - 'ConfigHeader' => Array('type' => 'string','default' => ''), + 'DisplayName' => Array('type' => 'string', 'required' => 1, 'default' => ''), + 'ModuleName' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'), + 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => ''), 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), 'SearchConfigId' => Array('type' => 'int','not_null' => '1','default' => ''), 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'FieldType' => Array('type' => 'string','not_null' => '1','default' => 'text'), - 'ForeignField' => Array('type' => 'string','default' => ''), - 'JoinClause' => Array('type' => 'string','default' => ''), - 'IsWhere' => Array('type' => 'string','default' => ''), - 'IsNotWhere' => Array('type' => 'string','default' => ''), - 'ContainsWhere' => Array('type' => 'string','default' => ''), - 'NotContainsWhere' => Array('type' => 'string','default' => ''), - 'CustomFieldId' => Array('type' => 'int', 'default' => ''), + 'FieldType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'), + 'ForeignField' => Array('type' => 'string','default' => null), + 'JoinClause' => Array('type' => 'string','default' => null), + 'IsWhere' => Array('type' => 'string','default' => null), + 'IsNotWhere' => Array('type' => 'string','default' => null), + 'ContainsWhere' => Array('type' => 'string','default' => null), + 'NotContainsWhere' => Array('type' => 'string','default' => null), + 'CustomFieldId' => Array('type' => 'int', 'default' => null), ), 'VirtualFields' => Array(