Henning Snater has submitted this change and it was merged.
Change subject: Handle blocked-user and protected-page different in UI
......................................................................
Handle blocked-user and protected-page different in UI
- The tooltip message for a protected-page should differ from
the message for a blocked-user
- Message and events were already there, just the IF statement was wrong
Change-Id: I82e173a772dabe203179c80a50f2e42d5925ad81
---
M repo/Wikibase.i18n.php
M repo/resources/wikibase.ui.entityViewInit.js
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Henning Snater: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 7836632..e875a1d 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -93,7 +93,7 @@
'wikibase-anonymouseditwarning' => "Warning: You are not logged in.
Your IP address will be recorded in the edit history of this $1.",
'wikibase-restrictionedit-tooltip-message' => 'This page is protected.
Editing is not allowed.',
- 'wikibase-blockeduser-tooltip-message' => 'You are blocked from
editing.',
+ 'wikibase-blockeduser-tooltip-message' => 'You do not have permission
to edit because your username or IP address has been blocked.',
'wikibase-move-error' => 'You cannot move pages that are in the data
namespace, and you cannot move pages into it.',
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 4494c33..bcc1175 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -156,7 +156,9 @@
}
}
- if ( mw.config.get( 'wbUserIsBlocked' ) || !mw.config.get(
'wbUserCanEdit' ) ) {
+ if ( !mw.config.get( 'wbUserCanEdit' ) ) {
+ $( wb ).triggerHandler( 'restrictEntityPageActions' );
+ } else if ( mw.config.get( 'wbUserIsBlocked' ) ) {
$( wb ).triggerHandler( 'blockEntityPageActions' );
}
--
To view, visit https://gerrit.wikimedia.org/r/59125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82e173a772dabe203179c80a50f2e42d5925ad81
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: Henning Snater <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
