https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113287
Revision: 113287
Author: emsmith
Date: 2012-03-07 20:22:06 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
bug 34090 - usernames and formatted timestamps into red lines for
hidden/oversighted both on page load and dynamic hide/oversight (uses the
data-blah custom attribute trick with jquery)
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-07 20:21:32 UTC (rev 113286)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-07 20:22:06 UTC (rev 113287)
@@ -81,8 +81,8 @@
'articlefeedbackv5-special-more' => 'Show more posts',
'articlefeedbackv5-special-pagetitle' => 'Feedback: $1',
'articlefeedbackv5-form-optionid' => 'Option $1',
- 'articlefeedbackv5-hidden' => 'This post was hidden by an authorized
editor',
- 'articlefeedbackv5-deleted' => 'This post was deleted by oversighters',
+ 'articlefeedbackv5-hidden' => 'This post was hidden by $1 on $2',
+ 'articlefeedbackv5-deleted' => 'This post was deleted by $1 on $2',
'articlefeedbackv5-form-hide' => 'Hide this post',
'articlefeedbackv5-form-unhide' => 'Unhide this post',
'articlefeedbackv5-form-helpful' => 'Mark as helpful ($1)',
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
2012-03-07 20:21:32 UTC (rev 113286)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
2012-03-07 20:22:06 UTC (rev 113287)
@@ -82,9 +82,9 @@
$filters['undeleted'] = -1;
}
- // TODO: This is data for the "hidden by,
oversighted by" red line
- $results['oversight_user'] = $wgUser->getId();
- $results['oversight_timestamp'] = $timestamp;
+ // This is data for the "hidden by, oversighted
by" red line
+ $results['oversight-user'] = $wgUser->getName();
+ $results['oversight-timestamp'] = wfTimestamp(
TS_RFC2822, $timestamp );
// autohide if not hidden
if (false == $record->af_is_hidden ) {
@@ -97,9 +97,9 @@
$implicit_hide = true; // for logging
// tell front-end autohiding was done
$results['autohidden'] = 1;
- // TODO: This is data for the "hidden
by, oversighted by" red line
- $results['hide_user'] = 0;
- $results['hide_timestamp'] = $timestamp;
+ // This is data for the "hidden by,
oversighted by" red line
+ $results['hide-user'] = 'Article
Feedback V5';
+ $results['hide-timestamp'] =
wfTimestamp( TS_RFC2822, $timestamp );
}
} else {
@@ -129,9 +129,9 @@
$update['af_hide_timestamp'] = $timestamp;
$filters = $this->changeFilterCounts( $record,
$filters, 'hide' );
- // TODO: This is data for the "hidden by,
oversighted by" red line
- $results['hide_user'] = $wgUser->getId();
- $results['hide_timestamp'] = $timestamp;
+ // This is data for the "hidden by, oversighted
by" red line
+ $results['hide-user'] = $wgUser->getName();
+ $results['hide-timestamp'] = wfTimestamp(
TS_RFC2822, $timestamp );
} else {
// decrease means "unhide this"
@@ -201,9 +201,9 @@
// tell front-end autohiding was done
$results['autohidden'] = 1;
- // TODO: This is data for the "hidden
by, oversighted by" red line
- $results['hide_user'] = 0;
- $results['hide_timestamp'] = $timestamp;
+ // This is data for the "hidden by,
oversighted by" red line
+ $results['hide-user'] = 'Article
Feedback V5';
+ $results['hide-timestamp'] =
wfTimestamp( TS_RFC2822, $timestamp );
}
}
@@ -249,9 +249,9 @@
$implicit_hide = true; // for logging
// tell front-end autohiding was done
$results['autohidden'] = 1;
- // TODO: This is data for the "hidden
by, oversighted by" red line
- $results['hide_user'] = 0;
- $results['hide_timestamp'] = $timestamp;
+ // This is data for the "hidden by,
oversighted by" red line
+ $results['hide-user'] = 'Article
Feedback V5';
+ $results['hide-timestamp'] =
wfTimestamp( TS_RFC2822, $timestamp );
}
// IF the previous setting was 0, send an email
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-03-07 20:21:32 UTC (rev 113286)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-03-07 20:22:06 UTC (rev 113287)
@@ -508,9 +508,9 @@
$name = 'Article Feedback V5';
}
- $attributes['hide_user'] = $name;
+ $attributes['data-hide-user'] = $name;
if ($record[0]->af_hide_timestamp > 0) {
- $attributes['hide_timestamp'] = wfTimestamp(
TS_RFC2822, $record[0]->af_hide_timestamp );
+ $attributes['data-hide-timestamp'] =
wfTimestamp( TS_RFC2822, $record[0]->af_hide_timestamp );
}
}
if ( $record[0]->af_is_deleted ) {
@@ -525,9 +525,9 @@
$name = 'Article Feedback V5';
}
- $attributes['oversight_user'] = $name;
+ $attributes['data-oversight-user'] = $name;
if ($record[0]->af_oversight_timestamp > 0) {
- $attributes['oversight_timestamp'] =
wfTimestamp( TS_RFC2822, $record[0]->af_oversight_timestamp );
+ $attributes['data-oversight-timestamp'] =
wfTimestamp( TS_RFC2822, $record[0]->af_oversight_timestamp );
}
}
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-07 20:21:32 UTC (rev 113286)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-07 20:22:06 UTC (rev 113287)
@@ -476,7 +476,7 @@
$row.addClass( 'articleFeedbackv5-feedback-hidden' )
.data( 'hidden', true );
$( '<span
class="articleFeedbackv5-feedback-hidden-marker"></span>' )
- .text( mw.msg( 'articlefeedbackv5-hidden' ) )
+ .text( mw.msg( 'articlefeedbackv5-hidden',
$row.data('hide-user'), $row.data('hide-timestamp')) )
.insertBefore( $row.find(
'.articleFeedbackv5-comment-wrap h3' ) );
$.articleFeedbackv5special.maskPost( $row );
};
@@ -523,7 +523,7 @@
$row.addClass( 'articleFeedbackv5-feedback-deleted' )
.data( 'deleted', true );
var $marker = $( '<span
class="articleFeedbackv5-feedback-deleted-marker"></span>' )
- .text( mw.msg( 'articlefeedbackv5-deleted' ) )
+ .text( mw.msg( 'articlefeedbackv5-deleted',
$row.data('oversight-user'), $row.data('oversight-timestamp') ) )
.insertBefore( $row.find(
'.articleFeedbackv5-comment-wrap h3' ) );
$.articleFeedbackv5special.maskPost( $row );
};
@@ -1033,6 +1033,10 @@
.text( mw.msg(
'articlefeedbackv5-form-unhide' ) )
.removeClass(
'articleFeedbackv5-hide-link' )
.addClass(
'articleFeedbackv5-show-link' );
+
+ $link.data( 'hide-user',
data['articlefeedbackv5-flag-feedback']['hide-user']);
+ $link.data( 'hide-timestamp',
data['articlefeedbackv5-flag-feedback']['hide-timestamp']);
+
$.articleFeedbackv5special.markHidden(
$link.closest( '.articleFeedbackv5-feedback' ) );
$.articleFeedbackv5special.setActivityFlag( id,
'hide', true );
}
@@ -1108,6 +1112,10 @@
.text( mw.msg(
'articlefeedbackv5-form-undelete' ) )
.removeClass(
'articleFeedbackv5-oversight-link' )
.addClass(
'articleFeedbackv5-unoversight-link' );
+
+ $link.data( 'oversight-user',
data['articlefeedbackv5-flag-feedback']['oversight-user']);
+ $link.data( 'oversight-timestamp',
data['articlefeedbackv5-flag-feedback']['oversight-timestamp']);
+
$.articleFeedbackv5special.markDeleted(
$link.closest( '.articleFeedbackv5-feedback' ) );
$.articleFeedbackv5special.setActivityFlag( id,
'delete', true );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
