jenkins-bot has submitted this change and it was merged.
Change subject: Show pending changes notice about unstable transclusions in VE
......................................................................
Show pending changes notice about unstable transclusions in VE
Bug: 52280
Change-Id: Ic03293348a78fd0b0674a29893baff39e5d99290
---
M frontend/FlaggablePageView.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 385de57..ec21e98 100644
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -935,6 +935,11 @@
$notices['review-edit-diff'] = $this->msg(
'review-edit-diff' )->parse() . ' ' .
FlaggedRevsXML::diffToggle( $diffUrl );
}
+
+ if ( $this->article->onlyTemplatesOrFilesPending() &&
$this->article->getPendingRevCount() == 0 ) {
+ $this->setPendingNotice( $frev, '', false );
+ $notices['review-transclusions'] = $this->reviewNotice;
+ }
}
/**
@@ -1384,9 +1389,10 @@
* Adds a notice saying that this revision is pending review
* @param FlaggedRevision $srev The stable version
* @param string $diffToggle either "" or " <diff toggle><diff div>"
+ * @param boolean $background Whether to add the 'flaggedrevs_preview'
CSS class (the blue background)
* @return void
*/
- public function setPendingNotice( FlaggedRevision $srev, $diffToggle =
'' ) {
+ public function setPendingNotice( FlaggedRevision $srev, $diffToggle =
'', $background = true ) {
$this->load();
$time = $this->getLanguage()->date( $srev->getTimestamp(), true
);
$revsSince = $this->article->getPendingRevCount();
@@ -1395,7 +1401,8 @@
'revreview-newest-basic';
$msg .= ( $revsSince == 0 ) ? '-i' : '';
# Add bar msg to the top of the page...
- $css = 'flaggedrevs_preview plainlinks';
+ $css = 'plainlinks';
+ if ( $background ) $css .= ' flaggedrevs_preview';
// Messages: revreview-newest-quality-i,
revreview-newest-basic-i
$msgHTML = $this->msg( $msg, $srev->getRevId(), $time
)->numParams( $revsSince )->parse();
$this->reviewNotice .= "<div id='mw-fr-reviewnotice'
class='$css'>" .
--
To view, visit https://gerrit.wikimedia.org/r/123875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic03293348a78fd0b0674a29893baff39e5d99290
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
