jenkins-bot has submitted this change and it was merged.
Change subject: Fix previewing banner on-wiki
......................................................................
Fix previewing banner on-wiki
Change-Id: I68933ce42015f61f89cce3fbdcc83b3038607da3
---
M modules/ext.centralNotice.bannerController/bannerController.js
M tests/qunit/ext.centralNotice.bannerController/bannerController.tests.js
2 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 60e220e..5918cf2 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -390,10 +390,13 @@
if ( !mw.centralNotice.chooseBannerOnClient ) {
mw.centralNotice.storeBucket();
- } else {
+ } else if ( !mw.centralNotice.data.getVars.banner ) {
+
// If we are choosing banners on the client,
that means we
// haven't set the bucket in the impression
data. Add it
// along with its start and end dates.
+ // However we won't do this when a banner is
being forced via
+ // the banner URL param.
bucket =
mw.cnBannerControllerLib.bucketsByCampaign[impressionData.campaign];
impressionData.bucket = bucket.val;
impressionData.bucketStart = bucket.start;
diff --git
a/tests/qunit/ext.centralNotice.bannerController/bannerController.tests.js
b/tests/qunit/ext.centralNotice.bannerController/bannerController.tests.js
index 91aa12d..8d03f7f 100644
--- a/tests/qunit/ext.centralNotice.bannerController/bannerController.tests.js
+++ b/tests/qunit/ext.centralNotice.bannerController/bannerController.tests.js
@@ -48,6 +48,14 @@
mw.centralNotice.loadBanner = realLoadBanner;
+ // Mock out buckets
+ mw.cnBannerControllerLib.bucketsByCampaign = {};
+
mw.cnBannerControllerLib.bucketsByCampaign[bannerData.campaign] = {
+ val: 0,
+ start: 1419937200,
+ end: 1414754400
+ };
+
// Create normalized siteNotice.
$( "#qunit-fixture" ).append(
'<div id=siteNotice><div
id=centralNotice></div></div>'
--
To view, visit https://gerrit.wikimedia.org/r/175606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68933ce42015f61f89cce3fbdcc83b3038607da3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
