Index: branches/RC/core/units/email_queue/email_queue_config.php =================================================================== diff -u -N -r11154 -r11319 --- branches/RC/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 11154) +++ branches/RC/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 11319) @@ -28,7 +28,7 @@ 'Sections' => Array ( 'in-portal:email_queue' => Array ( - 'parent' => 'in-portal:email_folder', + 'parent' => 'in-portal:mailing_folder', 'icon' => 'email_log', 'label' => 'la_tab_EmailQueue', 'url' => Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'), @@ -57,6 +57,7 @@ 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0), 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0), + 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ), 'Grids' => Array ( @@ -70,6 +71,7 @@ 'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', ), 'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', ), 'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', ), + 'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', ), ), ), ),