[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Make aggregated feed work on Beta Cluster

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Make aggregated feed work on Beta Cluster
..


Make aggregated feed work on Beta Cluster

There were two problems on Beta Cluster:
1) The news portion failed because the news page was very old and use a very 
different
structure than what we expect. I updated the page on Beta Cluster.

2) There's no featured article for English Beta Cluster. This patch fixes that 
by not trying
to get a featured article if the domain is for Beta Cluster.

I temporarily modified the file locally on appservice.wmflabs.org. Once the 
service gets
restarted this won't work anymore until this patch is merged.

Bug: T145672
Change-Id: Ie35e97390f817822dd0f8ed22d0e674a45da866c
---
M lib/feed/featured.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index 3ea0538..d9aac14 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -74,7 +74,7 @@
 function promise(app, req) {
 dateUtil.validate(dateUtil.hyphenDelimitedDateString(req));
 var aggregated = !!req.query.aggregated;
-if (req.params.domain.indexOf('en') !== 0) {
+if (req.params.domain.indexOf('en') !== 0 || 
req.params.domain.indexOf('beta.wmflabs.org') > 0) {
 if (aggregated) {
 return BBPromise.resolve({});
 } else {

-- 
To view, visit https://gerrit.wikimedia.org/r/312468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie35e97390f817822dd0f8ed22d0e674a45da866c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Make aggregated feed work on Beta Cluster

[BearND (Code Review)]

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312468

Change subject: Make aggregated feed work on Beta Cluster
..

Make aggregated feed work on Beta Cluster

There were two problems on Beta Cluster:
1) The news portion failed because the news page was very old and use a very 
different
structure than what we expect. I updated the page on Beta Cluster.

2) There's no featured article for English Beta Cluster. This patch fixes that 
by not trying
to get a featured article if the domain is for Beta Cluster.

I temporarily modified the file locally on appservice.wmflabs.org. Once the 
service gets
restarted this won't work anymore until this patch is merged.

Change-Id: Ie35e97390f817822dd0f8ed22d0e674a45da866c
---
M lib/feed/featured.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/68/312468/1

diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index 3ea0538..d9aac14 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -74,7 +74,7 @@
 function promise(app, req) {
 dateUtil.validate(dateUtil.hyphenDelimitedDateString(req));
 var aggregated = !!req.query.aggregated;
-if (req.params.domain.indexOf('en') !== 0) {
+if (req.params.domain.indexOf('en') !== 0 || 
req.params.domain.indexOf('beta.wmflabs.org') > 0) {
 if (aggregated) {
 return BBPromise.resolve({});
 } else {

-- 
To view, visit https://gerrit.wikimedia.org/r/312468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie35e97390f817822dd0f8ed22d0e674a45da866c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits