Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php =================================================================== diff -u -r1412 -r1421 --- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 1412) +++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 1421) @@ -4,12 +4,45 @@ $config = Array( 'Prefix' => 'selectors', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), + 'ItemClass' => Array('class'=>'SelectorsItem','file'=>'selectors_item.php','build_event'=>'OnItemBuild'), 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), 'EventHandlerClass' => Array('class'=>'SelectorsEventHandler','file'=>'selectors_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'SelectorsTagProcessor','file'=>'selectors_tag_processor.php','build_event'=>'OnBuild'), 'AutoLoad' => true, - 'Hooks' => Array(), + 'Hooks' => Array( + Array( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'selectors', + 'HookToSpecial' => '', + 'HookToEvent' => Array('OnBeforeItemUpdate','OnBeforeItemCreate'), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnSerializeSelectorData', + ), + + Array( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'selectors', + 'HookToSpecial' => '', + 'HookToEvent' => Array('OnAfterItemUpdate','OnAfterItemCreate'), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnUnserializeSelectorData', + ), + + Array( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'selectors', + 'HookToSpecial' => '', + 'HookToEvent' => Array('OnItemBuild','OnListBuild'), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnPrepareBaseStyles', + ), + ), 'QueryString' => Array( 1 => 'id', 2 => 'page', @@ -27,7 +60,8 @@ 'AutoDelete' => true, 'AutoClone' => true, - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'ListSQLs' => Array( ''=>' SELECT %1$s.* + FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', ), @@ -40,14 +74,14 @@ 'SelectorId' => Array(), 'StylesheetId' => Array('type' => 'int','not_null' => '1','default' => '0'), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), - 'SelectorName' => Array('type' => 'string','not_null' => '1','default' => ''), + 'SelectorName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'SelectorData' => Array('not_null' => '1','default' => ''), 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( STYLE_BASE => 'la_BaseSelectors', STYLE_BLOCK => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'), - 'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'), ), - 'VirtualFields' => Array(), + 'VirtualFields' => Array( ), 'Grids' => Array( 'Default' => Array(