Skip to content

Commit

Permalink
Add email on monitor to config page
Browse files Browse the repository at this point in the history
Email on "monitor" is an existing action, which is already configured in
config_defaults_inc, but it's not displayed in the email configuration
page.

Fixes: #26002
  • Loading branch information
cproensa authored and atrol committed Nov 1, 2019
1 parent 3a900e7 commit fa10a33
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion core/email_api.php
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,7 @@ function email_shutdown_function() {
* @return array List of actions
*/
function email_get_actions() {
$t_actions = array( 'updated', 'owner', 'reopened', 'deleted', 'bugnote', 'relation' );
$t_actions = array( 'updated', 'owner', 'reopened', 'deleted', 'bugnote', 'relation', 'monitor' );

if( config_get( 'enable_sponsorship' ) == ON ) {
$t_actions[] = 'sponsor';
Expand Down
1 change: 1 addition & 0 deletions lang/strings_english.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1482,6 +1482,7 @@ $s_email_on_deleted = 'E-mail on Deleted';
$s_email_on_sponsorship_changed = 'E-mail on Sponsorship changed';
$s_email_on_relationship_changed = 'E-mail on Relationship changed';
$s_email_on_updated = 'E-mail on Updated';
$s_email_on_monitor = 'E-mail when user starts monitoring';

# Dynamic filters (load filter controls via AJAX upon request)
$s_loading = 'Loading...';
Expand Down
1 change: 1 addition & 0 deletions manage_config_email_page.php
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ function get_section_end_for_email() {
}

get_capability_row_for_email( lang_get( 'email_on_relationship_changed' ), 'relation' );
get_capability_row_for_email( lang_get( 'email_on_monitor' ), 'monitor' );

$t_statuses = MantisEnum::getAssocArrayIndexedByValues( config_get( 'status_enum_string' ) );
foreach ( $t_statuses as $t_status => $t_label ) {
Expand Down

0 comments on commit fa10a33

Please sign in to comment.