jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Add "Last hit" timestamp column to Special:AbuseFilter
list view"
......................................................................
Revert "Add "Last hit" timestamp column to Special:AbuseFilter list view"
This reverts commit 77d161f65c2730c94807479caa05832801405956.
Bug: T106798
Change-Id: I265ae108aecbacfcce808ad21e18be4e0eef750e
---
M Views/AbuseFilterViewList.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 1 insertion(+), 24 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Views/AbuseFilterViewList.php b/Views/AbuseFilterViewList.php
index b102b27..0ccaa73 100644
--- a/Views/AbuseFilterViewList.php
+++ b/Views/AbuseFilterViewList.php
@@ -205,7 +205,7 @@
function getQueryInfo() {
return array(
- 'tables' => array( 'abuse_filter', 'abuse_filter_log',
),
+ 'tables' => array( 'abuse_filter' ),
'fields' => array(
'af_id',
'af_enabled',
@@ -219,16 +219,8 @@
'af_user',
'af_actions',
'af_group',
- 'afl_timestamp' => 'MAX(afl_timestamp)',
),
'conds' => $this->mConds,
- 'options' => array( 'GROUP BY' => 'af_id' ),
- 'join_conds' => array(
- 'abuse_filter_log' => array(
- 'LEFT JOIN',
- 'af_id=afl_filter'
- )
- )
);
}
@@ -247,7 +239,6 @@
'af_timestamp' => 'abusefilter-list-lastmodified',
'af_hidden' => 'abusefilter-list-visibility',
'af_hit_count' => 'abusefilter-list-hitcount',
- 'afl_timestamp' => 'abusefilter-list-lasthit',
);
global $wgAbuseFilterValidGroups;
@@ -314,12 +305,6 @@
$link = "";
}
return $link;
- case 'afl_timestamp':
- $timestamp = '';
- if ( $row->afl_timestamp &&
SpecialAbuseLog::canSeeDetails( $row->af_id, $row->af_hidden ) ) {
- $timestamp = $lang->timeanddate(
$row->afl_timestamp, true );
- }
- return $timestamp;
case 'af_timestamp':
$userLink =
Linker::userLink(
@@ -422,12 +407,6 @@
return '';
}
return $this->msg( 'abusefilter-hitcount'
)->numParams( $value )->parse();
- case 'afl_timestamp':
- $timestamp = '';
- if ( !$row->af_hidden && $row->afl_timestamp ) {
- $timestamp = $lang->timeanddate(
$row->afl_timestamp, true );
- }
- return $timestamp;
case 'af_timestamp':
$user = $row->af_user_text;
return $this->msg(
diff --git a/i18n/en.json b/i18n/en.json
index cc957f6..f10ddde 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -86,7 +86,6 @@
"abusefilter-list-consequences": "Consequences",
"abusefilter-list-visibility": "Visibility",
"abusefilter-list-hitcount": "Hit count",
- "abusefilter-list-lasthit": "Last hit",
"abusefilter-list-edit": "Edit",
"abusefilter-list-details": "Details",
"abusefilter-list-limit": "Number per page:",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 59c83a7..a2cfbe2 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -115,7 +115,6 @@
"abusefilter-list-consequences": "Column header in abuse filter
overview for the filter consequences.",
"abusefilter-list-visibility": "Column header in abuse filter overview
for the public filter visibility.\n{{Identical|Visibility}}",
"abusefilter-list-hitcount": "Column header in abuse filter overview
for the number of times the filter was triggered.",
- "abusefilter-list-lasthit": "Column header in abuse filter overview for
the last timestamp in which the filter was triggered.",
"abusefilter-list-edit": "Probably the verb \"to edit\" (instead of the
noun \"an edit\").\n{{Identical|Edit}}",
"abusefilter-list-details": "{{Identical|Detail}}",
"abusefilter-list-limit": "Used as label for the Limit selector in the
form.",
--
To view, visit https://gerrit.wikimedia.org/r/226695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I265ae108aecbacfcce808ad21e18be4e0eef750e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: wmf/1.26wmf15
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Se4598 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
