[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: For invalid or missing campaign show error about enable beta...

2017-11-13 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390980 )

Change subject: For invalid or missing campaign show error about enable beta 
feature
..


For invalid or missing campaign show error about enable beta feature

Showing group access permission here does not make sense.

Bug: T180082
Change-Id: I2823c7aa72d775085dc314f26c394ff63a017b33
---
M specials/SpecialContentTranslation.php
1 file changed, 3 insertions(+), 9 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Checked; Looks good to me, approved



diff --git a/specials/SpecialContentTranslation.php 
b/specials/SpecialContentTranslation.php
index 380d6be..68e9f3c 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -124,17 +124,11 @@
// Direct access, isListed only affects Special:SpecialPages
if ( !ContentTranslationHooks::isEnabledForUser( $user ) ) {
if ( $hasToken || $isCampaign ) {
-   // User has a token. Enabled cx for the user in 
this wiki.
+   // User has a token or a valid campaign param.
+   // Enable cx for the user in this wiki.
$this->enableCXBetaFeature();
} else {
-   if ( $campaign ) {
-   // Show login page if the URL has 
campaign parameter
-   $out->showPermissionsErrorPage(
-   [ [ 'badaccess-groups' ] ],
-   'edit'
-   );
-   return;
-   }
+   // Invalid or missing campaign param
$out->showErrorPage(
'cx',
'cx-specialpage-enable-betafeature',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2823c7aa72d775085dc314f26c394ff63a017b33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
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...ContentTranslation[master]: For invalid or missing campaign show error about enable beta...

2017-11-13 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390980 )

Change subject: For invalid or missing campaign show error about enable beta 
feature
..

For invalid or missing campaign show error about enable beta feature

Showing group access permission here does not make sense.

Bug: T180082
Change-Id: I2823c7aa72d775085dc314f26c394ff63a017b33
---
M specials/SpecialContentTranslation.php
1 file changed, 3 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/80/390980/1

diff --git a/specials/SpecialContentTranslation.php 
b/specials/SpecialContentTranslation.php
index 380d6be..68e9f3c 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -124,17 +124,11 @@
// Direct access, isListed only affects Special:SpecialPages
if ( !ContentTranslationHooks::isEnabledForUser( $user ) ) {
if ( $hasToken || $isCampaign ) {
-   // User has a token. Enabled cx for the user in 
this wiki.
+   // User has a token or a valid campaign param.
+   // Enable cx for the user in this wiki.
$this->enableCXBetaFeature();
} else {
-   if ( $campaign ) {
-   // Show login page if the URL has 
campaign parameter
-   $out->showPermissionsErrorPage(
-   [ [ 'badaccess-groups' ] ],
-   'edit'
-   );
-   return;
-   }
+   // Invalid or missing campaign param
$out->showErrorPage(
'cx',
'cx-specialpage-enable-betafeature',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2823c7aa72d775085dc314f26c394ff63a017b33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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