Clarify "filter" field in SpecialAbuseLog and ApiQueryAbuseLog

The "filter" fields can also accept a list of filters, and also global filters, so make it clear in the UI and in messages.

Change-Id: Ib258716d8e6792fd496938ebb4e8a2565d6370b7
This commit is contained in:
Daimona Eaytoy 2019-02-07 15:18:47 +01:00 committed by Krinkle
parent c0b6267022
commit 71e3719e12
6 changed files with 12 additions and 4 deletions

View file

@ -44,7 +44,7 @@
"apihelp-query+abuselog-param-end": "The timestamp to stop enumerating at.",
"apihelp-query+abuselog-param-user": "Show only entries done by a given user or IP address.",
"apihelp-query+abuselog-param-title": "Show only entries occurring on a given page.",
"apihelp-query+abuselog-param-filter": "Show only entries that were caught by a given filter ID.",
"apihelp-query+abuselog-param-filter": "Show only entries that were caught by the given filter IDs. Separate with pipes, prefix with \"$1\" for global filters.",
"apihelp-query+abuselog-param-limit": "The maximum amount of entries to list.",
"apihelp-query+abuselog-param-prop": "Which properties to get.",
"apihelp-query+abuselog-param-wiki": "Wiki to show hits from.",

View file

@ -76,7 +76,7 @@
"apihelp-query+abuselog-param-end": "{{doc-apihelp-param|query+abuselog|end}}",
"apihelp-query+abuselog-param-user": "{{doc-apihelp-param|query+abuselog|user}}",
"apihelp-query+abuselog-param-title": "{{doc-apihelp-param|query+abuselog|title}}",
"apihelp-query+abuselog-param-filter": "{{doc-apihelp-param|query+abuselog|filter}}",
"apihelp-query+abuselog-param-filter": "{{doc-apihelp-param|query+abuselog|filter}}\nParameters:\n* $1 - The prefix to use for global filters.",
"apihelp-query+abuselog-param-limit": "{{doc-apihelp-param|query+abuselog|limit}}",
"apihelp-query+abuselog-param-prop": "{{doc-apihelp-param|query+abuselog|prop}}",
"apihelp-query+abuselog-param-wiki": "{{doc-apihelp-param|query+abuselog|wiki}}",

View file

@ -51,7 +51,8 @@
"abusefilter-log-search-user": "User:",
"abusefilter-log-search-group": "Filter group:",
"abusefilter-log-search-group-any": "Any",
"abusefilter-log-search-filter": "Filter IDs (separate with pipes):",
"abusefilter-log-search-filter": "Filter IDs:",
"abusefilter-log-search-filter-help": "Separate with pipes, prefix with \"$1\" for global filters",
"abusefilter-log-search-title": "Title:",
"abusefilter-log-search-wiki": "Wiki:",
"abusefilter-log-search-impact": "Impact:",

View file

@ -86,6 +86,7 @@
"abusefilter-log-search-group": "Field label in abuse filter log page.",
"abusefilter-log-search-group-any": "Option allowing to find entries from any group in abuse log.\n{{Identical|Any}}",
"abusefilter-log-search-filter": "Field label in abuse filter log page.",
"abusefilter-log-search-filter-help": "Help text, see {{msg-mw|abusefilter-log-search-filter}}. Parameters:\n* $1 - The prefix used by global filters",
"abusefilter-log-search-title": "Field label in abuse filter log page.\n{{Identical|Title}}",
"abusefilter-log-search-wiki": "Label for text field that allows the user to limit search results to a specific wiki, by name.\n{{Identical|Wiki}}",
"abusefilter-log-search-impact": "Label for options allowing to filter abuse log by whether the action was actually saved.\n{{Identical|Impact}}",

View file

@ -266,7 +266,11 @@ class ApiQueryAbuseLog extends ApiQueryBase {
'title' => null,
'filter' => [
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_ISMULTI => true
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_HELP_MSG => [
'apihelp-query+abuselog-param-filter',
AbuseFilter::GLOBAL_FILTER_PREFIX
]
],
'limit' => [
ApiBase::PARAM_DFLT => 10,

View file

@ -282,6 +282,8 @@ class SpecialAbuseLog extends SpecialPage {
'label-message' => 'abusefilter-log-search-filter',
'type' => 'text',
'default' => $this->mSearchFilter,
'help' => $this->msg( 'abusefilter-log-search-filter-help' )
->params( AbuseFilter::GLOBAL_FILTER_PREFIX )->escaped()
];
}
if ( $this->getConfig()->get( 'AbuseFilterIsCentral' ) ) {