jenkins-bot has submitted this change and it was merged.
Change subject: Style resolved topics differently in TOC
......................................................................
Style resolved topics differently in TOC
Change-Id: I6b5ffbf3aa09278b734e8d8682271acf2cbececf
---
M includes/Formatter/TocTopicListFormatter.php
M modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
M modules/styles/flow/widgets/mw.flow.ui.TopicMenuSelectWidget.less
M tests/phpunit/api/ApiFlowViewTopicListTest.php
4 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Formatter/TocTopicListFormatter.php
b/includes/Formatter/TocTopicListFormatter.php
index d5acf5f..f869764 100644
--- a/includes/Formatter/TocTopicListFormatter.php
+++ b/includes/Formatter/TocTopicListFormatter.php
@@ -43,6 +43,15 @@
$workflow = $workflowsByWorkflowId[$topicId];
+ $moderatedRevision =
$this->templating->getModeratedRevision( $postRevision );
+ $moderationData = $moderatedRevision->isModerated() ?
+ array(
+ 'isModerated' => true,
+ 'moderateState' =>
$moderatedRevision->getModerationState(),
+ ) :
+ array(
+ 'isModerated' => false
+ );
$result['revisions'][$revisionId] = array(
// Keep this as a minimal subset of
// RevisionFormatter->formatApi, and keep the
same content
@@ -59,7 +68,7 @@
'format' => $contentFormat,
),
'last_updated' =>
$workflow->getLastUpdatedObj()->getTimestamp() * 1000,
- );
+ ) + $moderationData;
}
$pagingOption = $page->getPagingLinksOptions();
diff --git a/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
index fb475df..cdf7ed8 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
@@ -151,7 +151,10 @@
if ( !optionWidget ) {
optionWidget = new OO.ui.MenuOptionWidget( {
data: items[ i ],
- label: items[ i ].getContent()
+ label: items[ i ].getContent(),
+ classes: items[ i
].getModerationState() === 'lock' ?
+ [
'flow-ui-topicMenuSelectWidget-locked' ] :
+ []
} );
}
widgets.push( optionWidget );
diff --git a/modules/styles/flow/widgets/mw.flow.ui.TopicMenuSelectWidget.less
b/modules/styles/flow/widgets/mw.flow.ui.TopicMenuSelectWidget.less
index 0f67487..c51e616 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.TopicMenuSelectWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.TopicMenuSelectWidget.less
@@ -2,6 +2,10 @@
position: relative;
overflow-y: auto;
+ &-locked, &-locked:hover {
+ color: #999;
+ }
+
// Override border-color and margin-top from OOUI MenuSelectWidget
border-color: #ccc;
margin-top: 0;
diff --git a/tests/phpunit/api/ApiFlowViewTopicListTest.php
b/tests/phpunit/api/ApiFlowViewTopicListTest.php
index aba64bc..0388cc8 100644
--- a/tests/phpunit/api/ApiFlowViewTopicListTest.php
+++ b/tests/phpunit/api/ApiFlowViewTopicListTest.php
@@ -35,6 +35,7 @@
),
// This last_updated is used for the 'newest'
test, then later changed for 'updated' test.
'last_updated' =>
$actualRevision['last_updated'],
+ 'isModerated' => false,
);
}
--
To view, visit https://gerrit.wikimedia.org/r/229478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b5ffbf3aa09278b734e8d8682271acf2cbececf
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Pginer <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
