Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65799
Change subject: Add 'all but inappropriate' filter
......................................................................
Add 'all but inappropriate' filter
Change-Id: I499f3a5f7462dd85629bd45f1207792bcc1214d8
---
M ArticleFeedbackv5.i18n.php
M ArticleFeedbackv5.model.php
M SpecialArticleFeedbackv5.php
3 files changed, 38 insertions(+), 30 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/99/65799/1
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index b421f7d..1fa8b0a 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -98,6 +98,7 @@
'articlefeedbackv5-special-survey-button-text' => 'What do you think of
this feedback tool?',
'articlefeedbackv5-special-filter-featured' => 'Featured ($1)',
'articlefeedbackv5-special-filter-unreviewed' => 'Unreviewed ($1)',
+ 'articlefeedbackv5-special-filter-noinappropriate' => 'All but
inappropriate ($1)',
'articlefeedbackv5-special-filter-helpful' => 'Helpful ($1)',
'articlefeedbackv5-special-filter-unhelpful' => 'Unhelpful ($1)',
'articlefeedbackv5-special-filter-flagged' => 'Flagged ($1)',
@@ -114,6 +115,7 @@
'articlefeedbackv5-special-filter-all' => 'All posts ($1)',
'articlefeedbackv5-special-filter-featured-watchlist' => 'Featured',
'articlefeedbackv5-special-filter-unreviewed-watchlist' => 'Unreviewed',
+ 'articlefeedbackv5-special-filter-noinappropriate-watchlist' => 'All
but inappropriate',
'articlefeedbackv5-special-filter-helpful-watchlist' => 'Helpful',
'articlefeedbackv5-special-filter-unhelpful-watchlist' => 'Unhelpful',
'articlefeedbackv5-special-filter-flagged-watchlist' => 'Flagged',
@@ -845,6 +847,8 @@
'articlefeedbackv5-special-filter-featured' => 'Name of filter that
will show all feedback that has been marked as useful or helpful. $1 is the
amount of records in this filter.',
'articlefeedbackv5-special-filter-unreviewed' => 'Name of filter that
will show all feedback that has not yet been marked as anything. Parameters:
* $1 is the number of records in this filter.',
+ 'articlefeedbackv5-special-filter-noinappropriate' => 'Name of filter
that will show all feedback that has not been marked as inappropriate.
Parameters:
+* $1 is the number of records in this filter.',
'articlefeedbackv5-special-filter-helpful' => 'Name of filter that will
show all feedback that has been marked as helpful. $1 is the amount of records
in this filter.',
'articlefeedbackv5-special-filter-unhelpful' => 'Name of filter that
will show all feedback that has been marked as unhelpful. $1 is the amount of
records in this filter.',
'articlefeedbackv5-special-filter-flagged' => 'Name of filter that will
show all feedback that has been flagged for abuse. $1 is the amount of records
in this filter.',
@@ -865,6 +869,8 @@
{{Identical|Featured}}',
'articlefeedbackv5-special-filter-unreviewed-watchlist' => 'Name of
filter that will show all feedback that has not yet been marked as anything.
{{Identical|Unreviewed}}',
+ 'articlefeedbackv5-special-filter-noinappropriate-watchlist' => 'Name
of filter that will show all feedback that has not been marked as
inappropriate. Parameters:
+* $1 is the number of records in this filter.',
'articlefeedbackv5-special-filter-helpful-watchlist' => 'Name of filter
that will show all feedback that has been marked as helpful.',
'articlefeedbackv5-special-filter-unhelpful-watchlist' => 'Name of
filter that will show all feedback that has been marked as unhelpful.',
'articlefeedbackv5-special-filter-flagged-watchlist' => 'Name of filter
that will show all feedback that has been flagged for abuse.
diff --git a/ArticleFeedbackv5.model.php b/ArticleFeedbackv5.model.php
index 55826ae..617c02b 100644
--- a/ArticleFeedbackv5.model.php
+++ b/ArticleFeedbackv5.model.php
@@ -105,6 +105,10 @@
'permissions' => 'aft-reader',
'conditions' => array( 'aft_has_comment = 1',
'aft_oversight = 0', 'aft_archive = 0', 'aft_hide = 0', 'aft_feature = 0',
'aft_resolve = 0', 'aft_noaction = 0', 'aft_inappropriate = 0' ),
),
+ 'noinappropriate' => array(
+ 'permissions' => 'aft-reader',
+ 'conditions' => array( 'aft_has_comment = 1',
'aft_oversight = 0', 'aft_archive = 0', 'aft_hide = 0', 'aft_inappropriate = 0'
),
+ ),
// editor lists
'helpful' => array(
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index a3b62ef..34c08ab 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -579,41 +579,39 @@
);
}
- // filters to be displayed in dropdown (only for editors)
+ // filters to be displayed in dropdown (if any)
$filterSelectHtml = '';
- if ( $this->isAllowed( 'aft-editor' ) ) {
- $opts = array();
+ $opts = array();
- // Give grep a chance to find the usages:
- // articlefeedbackv5-special-filter-featured,
rticlefeedbackv5-special-filter-unreviewed,
- // articlefeedbackv5-special-filter-helpful,
articlefeedbackv5-special-filter-unhelpful,
- // articlefeedbackv5-special-filter-flagged,
articlefeedbackv5-special-filter-useful,
- // articlefeedbackv5-special-filter-resolved,
articlefeedbackv5-special-filter-noaction,
- // articlefeedbackv5-special-filter-inappropriate,
articlefeedbackv5-special-filter-archived,
- // articlefeedbackv5-special-filter-allcomment,
articlefeedbackv5-special-filter-hidden,
- // articlefeedbackv5-special-filter-requested,
articlefeedbackv5-special-filter-declined,
- // articlefeedbackv5-special-filter-oversighted,
- // articlefeedbackv5-special-filter-all
- foreach ( $this->filters as $filter ) {
- if ( in_array( $filter, array_keys(
$filterLabels ) ) ) {
- continue;
- }
-
- $count = ArticleFeedbackv5Model::getCount(
$filter, $this->pageId );
-
- $key = $this->msg(
"articlefeedbackv5-special-filter-$filter", $count )->escaped();
- $opts[(string) $key] = $filter;
+ // Give grep a chance to find the usages:
+ // articlefeedbackv5-special-filter-featured,
rticlefeedbackv5-special-filter-unreviewed,
+ // articlefeedbackv5-special-filter-noinappropriate,
articlefeedbackv5-special-filter-helpful,
+ // articlefeedbackv5-special-filter-unhelpful,
articlefeedbackv5-special-filter-flagged,
+ // articlefeedbackv5-special-filter-useful,
articlefeedbackv5-special-filter-resolved,
+ // articlefeedbackv5-special-filter-noaction,
articlefeedbackv5-special-filter-inappropriate,
+ // articlefeedbackv5-special-filter-archived,
articlefeedbackv5-special-filter-allcomment,
+ // articlefeedbackv5-special-filter-hidden,
articlefeedbackv5-special-filter-requested,
+ // articlefeedbackv5-special-filter-declined,
articlefeedbackv5-special-filter-oversighted,
+ // articlefeedbackv5-special-filter-all
+ foreach ( $this->filters as $filter ) {
+ if ( in_array( $filter, array_keys( $filterLabels ) ) )
{
+ continue;
}
- if ( count( $opts ) > 0 ) {
- // Put the "more filters" option at the
beginning of the opts array
- $opts = array( $this->msg(
'articlefeedbackv5-special-filter-select-more' )->text() => '' ) + $opts;
+ $count = ArticleFeedbackv5Model::getCount( $filter,
$this->pageId );
- $filterSelect = new XmlSelect( false,
'articleFeedbackv5-filter-select' );
- $filterSelect->setDefault(
$this->startingFilter );
- $filterSelect->addOptions( $opts );
- $filterSelectHtml = $filterSelect->getHTML();
- }
+ $key = $this->msg(
"articlefeedbackv5-special-filter-$filter", $count )->escaped();
+ $opts[(string) $key] = $filter;
+ }
+
+ if ( count( $opts ) > 0 ) {
+ // Put the "more filters" option at the beginning of
the opts array
+ $opts = array( $this->msg(
'articlefeedbackv5-special-filter-select-more' )->text() => '' ) + $opts;
+
+ $filterSelect = new XmlSelect( false,
'articleFeedbackv5-filter-select' );
+ $filterSelect->setDefault( $this->startingFilter );
+ $filterSelect->addOptions( $opts );
+ $filterSelectHtml = $filterSelect->getHTML();
}
return
--
To view, visit https://gerrit.wikimedia.org/r/65799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I499f3a5f7462dd85629bd45f1207792bcc1214d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
