Glaisher has submitted this change and it was merged. Change subject: Add log action filtering for gblblock ......................................................................
Add log action filtering for gblblock Bug: T109270 Change-Id: Id314c8d9e69499ab90dd29617689a8e63433507f --- M GlobalBlocking.php M i18n/en.json M i18n/qqq.json 3 files changed, 21 insertions(+), 2 deletions(-) Approvals: Glaisher: Looks good to me, approved MGChecker: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/GlobalBlocking.php b/GlobalBlocking.php index f7e8473..fd280b1 100644 --- a/GlobalBlocking.php +++ b/GlobalBlocking.php @@ -65,6 +65,13 @@ $wgLogActions['gblblock/whitelist'] = 'globalblocking-whitelist-logentry'; $wgLogActions['gblblock/dwhitelist'] = 'globalblocking-dewhitelist-logentry'; // Stupid logging table doesn't like >16 chars $wgLogActions['gblblock/modify'] = 'globalblocking-modify-logentry'; +$wgActionFilteredLogs['gblblock'] = array( + 'gblock' => array( 'gblock', 'gblock2' ), + 'gunblock' => array( 'gunblock' ), + 'modify' => array( 'modify' ), + 'whitelist' => array( 'whitelist' ), + 'dwhitelist' => array( 'dwhitelist' ) +); ## Permissions $wgGroupPermissions['steward']['globalblock'] = true; diff --git a/i18n/en.json b/i18n/en.json index 029fe1d..6579241 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -109,5 +109,11 @@ "apihelp-query+globalblocks-param-limit": "The maximum amount of blocks to list.", "apihelp-query+globalblocks-param-prop": "Which properties to get.", "apihelp-query+globalblocks-example-1": "List all global blocks", - "apihelp-query+globalblocks-example-2": "List global blocks applying to IP address 192.0.2.18" + "apihelp-query+globalblocks-example-2": "List global blocks applying to IP address 192.0.2.18", + "log-action-filter-gblblock": "Type of global block:", + "log-action-filter-gblblock-gblock": "Global block", + "log-action-filter-gblblock-gunblock": "Global unblock", + "log-action-filter-gblblock-modify": "Global block modification", + "log-action-filter-gblblock-whitelist": "Global block whitelist addition", + "log-action-filter-gblblock-dwhitelist": "Global block whitelist removal" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 8a07ea7..49e7f57 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -134,5 +134,11 @@ "apihelp-query+globalblocks-param-limit": "{{doc-apihelp-param|query+globalblocks|limit}}", "apihelp-query+globalblocks-param-prop": "{{doc-apihelp-param|query+globalblocks|prop}}", "apihelp-query+globalblocks-example-1": "{{doc-apihelp-example|query+globalblocks}}", - "apihelp-query+globalblocks-example-2": "{{doc-apihelp-example|query+globalblocks}}" + "apihelp-query+globalblocks-example-2": "{{doc-apihelp-example|query+globalblocks}}", + "log-action-filter-gblblock": "{{doc-log-action-filter-type|gblblock}}", + "log-action-filter-gblblock-gblock": "{{doc-log-action-filter-action|gblblock|gblock}}", + "log-action-filter-gblblock-gunblock": "{{doc-log-action-filter-action|gblblock|gunblock}}", + "log-action-filter-gblblock-modify": "{{doc-log-action-filter-action|gblblock|modify}}", + "log-action-filter-gblblock-whitelist": "{{doc-log-action-filter-action|gblblock|whitelist}}", + "log-action-filter-gblblock-dwhitelist": "{{doc-log-action-filter-action|gblblock|dwhitelist}}" } -- To view, visit https://gerrit.wikimedia.org/r/283484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id314c8d9e69499ab90dd29617689a8e63433507f Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/GlobalBlocking Gerrit-Branch: master Gerrit-Owner: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Glaisher <glaisher.w...@gmail.com> Gerrit-Reviewer: MGChecker <hgasu...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits