Index: branches/5.2.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php =================================================================== diff -u -N -r15268 -r15290 --- branches/5.2.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php (.../system_event_subscriptions_config.php) (revision 15268) +++ branches/5.2.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php (.../system_event_subscriptions_config.php) (revision 15290) @@ -1,6 +1,6 @@ Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'UserId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL), 'CategoryId' => Array ('type' => 'int', 'default' => NULL), + 'IncludeSublevels' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1 + ), 'ItemId' => Array ('type' => 'int', 'default' => NULL), 'ParentItemId' => Array ('type' => 'int', 'default' => NULL), 'SubscribedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#') @@ -124,6 +129,7 @@ 'UserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_range_filter', 'width' => 80), 'Username' => Array ('filter_block' => 'grid_like_filter'), 'CategoryId' => Array ('title' => 'column:la_fld_CategoryId', /*'data_block' => 'grid_category_td',*/ 'filter_block' => 'grid_range_filter', 'width' => 100), + 'IncludeSublevels' => Array ('filter_block' => 'grid_options_filter', 'width' => 100), 'CategoryName' => Array ('title' => 'column:la_fld_Category', 'filter_block' => 'grid_like_filter', 'width' => 200), 'ItemId' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), 'ItemName' => Array ('data_block' => 'grid_item_name_td', 'associated_field' => 'ItemId', 'filter_block' => 'grid_like_filter', 'width' => 120),