Index: branches/5.3.x/core/units/mailing_lists/mailing_lists_config.php =================================================================== diff -u -N -r15659 -r15677 --- branches/5.3.x/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 15659) +++ branches/5.3.x/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 15677) @@ -1,6 +1,6 @@ Array ( 'prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists!", - 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'primary_theme', 'clone', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'cancel', 'view', 'dbl-click'), ), 'mailing_list_edit' => Array ( @@ -86,6 +86,12 @@ FROM %1$s', ), + 'CalculatedFields' => Array ( + '' => Array ( + 'EmailsQueued' => 'CAST(%1$s.EmailsQueuedTotal AS SIGNED) - CAST(%1$s.EmailsSent AS SIGNED)', + ), + ), + 'ListSortings' => Array ( '' => Array ( 'Sorting' => Array ('MailingId' => 'desc'), @@ -99,7 +105,8 @@ 'type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array (USER_ROOT => 'root'), - 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', + 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s', + 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'required' => 1, 'not_null' => 1, 'default' => USER_ROOT, ), @@ -123,11 +130,15 @@ 'not_null' => 1, 'required' => 1, 'default' => 1 ), - 'EmailsQueued' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'EmailsQueuedTotal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'EmailsSent' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'EmailsTotal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ), + 'VirtualFields' => Array ( + 'EmailsQueued' => Array ('type' => 'int', 'default' => 0), + ), + 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ('default' => 'icon16_item.png'),