jenkins-bot has submitted this change and it was merged. Change subject: (bug 47496) Use (hidden) preference for copyright acknowledgment ......................................................................
(bug 47496) Use (hidden) preference for copyright acknowledgment Created hidden preference for copyright acknowledgment Removed code added/refactored in https://gerrit.wikimedia.org/r/89859 as it breaks preferences here. Change-Id: I61c5a155ac41c9b799095212d9b8243fc1bfbbca --- M repo/Wikibase.hooks.php M repo/Wikibase.php M repo/resources/wikibase.ui.entityViewInit.js 3 files changed, 28 insertions(+), 11 deletions(-) Approvals: Henning Snater: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php index 29e0833..3c324af 100644 --- a/repo/Wikibase.hooks.php +++ b/repo/Wikibase.hooks.php @@ -396,13 +396,8 @@ public static function onGetPreferences( User $user, array &$preferences ) { wfProfileIn( __METHOD__ ); - $preferences['wb-languages'] = array( - 'type' => 'multiselect', - 'usecheckboxes' => false, - 'label-message' => 'wikibase-setting-languages', - 'options' => $preferences['language']['options'], // all languages available in 'language' selector - 'section' => 'personal/i18n', - 'prefix' => 'wb-languages-', + $preferences['wb-acknowledgedcopyrightversion'] = array( + 'type' => 'api' ); wfProfileOut( __METHOD__ ); diff --git a/repo/Wikibase.php b/repo/Wikibase.php index 5667e41..a2298ff 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -168,6 +168,7 @@ $wgHooks['RecentChange_save'][] = 'Wikibase\RepoHooks::onRecentChangeSave'; $wgHooks['ArticleDeleteComplete'][] = 'Wikibase\RepoHooks::onArticleDeleteComplete'; $wgHooks['ArticleUndelete'][] = 'Wikibase\RepoHooks::onArticleUndelete'; + $wgHooks['GetPreferences'][] = 'Wikibase\RepoHooks::onGetPreferences'; $wgHooks['LinkBegin'][] = 'Wikibase\RepoHooks::onLinkBegin'; $wgHooks['OutputPageBodyAttributes'][] = 'Wikibase\RepoHooks::onOutputPageBodyAttributes'; //FIXME: handle other types of entities with autocomments too! diff --git a/repo/resources/wikibase.ui.entityViewInit.js b/repo/resources/wikibase.ui.entityViewInit.js index b223008..f01e942 100644 --- a/repo/resources/wikibase.ui.entityViewInit.js +++ b/repo/resources/wikibase.ui.entityViewInit.js @@ -225,7 +225,8 @@ // Display anonymous user edit warning: if ( mw.user && mw.user.isAnon() && $.find( '.mw-notification-content' ).length === 0 - && !$.cookie( 'wikibase-no-anonymouseditwarning' ) ) { + && !$.cookie( 'wikibase-no-anonymouseditwarning' ) + ) { mw.notify( mw.msg( 'wikibase-anonymouseditwarning', mw.msg( 'wikibase-entity-' + wb.entity.getType() ) @@ -239,9 +240,12 @@ var copyRight = mw.config.get( 'wbCopyright' ), copyRightVersion = copyRight.version, copyRightMessageHtml = copyRight.messageHtml, - cookieKey = 'wikibase.acknowledgedcopyrightversion'; + cookieKey = 'wikibase.acknowledgedcopyrightversion', + optionsKey = 'wb-acknowledgedcopyrightversion'; - if( copyRightVersion === $.cookie( cookieKey ) ) { + if ( $.cookie( cookieKey ) === copyRightVersion || + mw.user.options.get( optionsKey ) === copyRightVersion + ) { return; } @@ -284,7 +288,24 @@ $hideMessage.on( 'click', function( event ) { event.preventDefault(); $messageAnchor.data( 'wbtooltip' ).degrade( true ); - $.cookie( cookieKey, copyRightVersion, { 'expires': 365*3, 'path': '/' } ); + if ( mw.user.isAnon() ) { + $.cookie( cookieKey, copyRightVersion, { 'expires': 365 * 3, 'path': '/' } ); + } else { + var api = new mw.Api(); + api.get( { + 'action': 'tokens', + 'type': 'options' + }, function( data ) { + if ( data.tokens && data.tokens.optionstoken ) { + api.post( { + 'action': 'options', + 'token': data.tokens.optionstoken, + 'optionname': optionsKey, + 'optionvalue': copyRightVersion + } ); + } + } ); + } } ); $messageAnchor.data( 'wbtooltip' ).show(); -- To view, visit https://gerrit.wikimedia.org/r/89607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61c5a155ac41c9b799095212d9b8243fc1bfbbca Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene <benestar.wikime...@googlemail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Bene <benestar.wikime...@googlemail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Daniel Werner <daniel.a.r.wer...@gmail.com> Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de> Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com> Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
