X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki%2Fmediawiki.feedback.js;h=ca4d239606a7bf463b43169ed8f83c6204fb2e87;hp=f0e13b485496c6a185eec82135c287f4752dd9fe;hb=6bd9d7178a8f92c9b12b57d062fb12e35d86ed78;hpb=62699b37d6e37c728aa46db5520c6d6af8b6137f

diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js
index f0e13b4854..ca4d239606 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -57,6 +57,7 @@
 		this.feedbackPageTitle = config.title || new mw.Title( 'Feedback' );
 
 		this.messagePosterPromise = mw.messagePoster.factory.create( this.feedbackPageTitle, config.apiUrl );
+		this.foreignApi = config.apiUrl ? new mw.ForeignApi( config.apiUrl ) : null;
 
 		// Links
 		this.bugsTaskSubmissionLink = config.bugsLink || '//phabricator.wikimedia.org/maniphest/task/edit/form/1/';
@@ -83,46 +84,46 @@
 
 	/**
 	 * Respond to dialog submit event. If the information was
-	 * submitted, either successfully or with an error, open
-	 * a MessageDialog to thank the user.
+	 * submitted successfully, open a MessageDialog to thank the user.
 	 *
-	 * @param {string} [status] A status of the end of operation
+	 * @param {string} status A status of the end of operation
 	 *  of the main feedback dialog. Empty if the dialog was
 	 *  dismissed with no action or the user followed the button
 	 *  to the external task reporting site.
+	 * @param {string} feedbackPageName
+	 * @param {string} feedbackPageUrl
 	 */
-	mw.Feedback.prototype.onDialogSubmit = function ( status ) {
-		var dialogConfig = {};
-		switch ( status ) {
-			case 'submitted':
-				dialogConfig = {
-					title: mw.msg( 'feedback-thanks-title' ),
-					message: $( '<span>' ).msg(
-						'feedback-thanks',
-						this.feedbackPageTitle.getNameText(),
-						$( '<a>' ).attr( {
-							target: '_blank',
-							href: this.feedbackPageTitle.getUrl()
-						} )
-					),
-					actions: [
-						{
-							action: 'accept',
-							label: mw.msg( 'feedback-close' ),
-							flags: 'primary'
-						}
-					]
-				};
-				break;
+	mw.Feedback.prototype.onDialogSubmit = function ( status, feedbackPageName, feedbackPageUrl ) {
+		var dialogConfig;
+
+		if ( status !== 'submitted' ) {
+			return;
 		}
 
+		dialogConfig = {
+			title: mw.msg( 'feedback-thanks-title' ),
+			message: $( '<span>' ).msg(
+				'feedback-thanks',
+				feedbackPageName,
+				$( '<a>' ).attr( {
+					target: '_blank',
+					href: feedbackPageUrl
+				} )
+			),
+			actions: [
+				{
+					action: 'accept',
+					label: mw.msg( 'feedback-close' ),
+					flags: 'primary'
+				}
+			]
+		};
+
 		// Show the message dialog
-		if ( !$.isEmptyObject( dialogConfig ) ) {
-			this.constructor.static.windowManager.openWindow(
-				this.thankYouDialog,
-				dialogConfig
-			);
-		}
+		this.constructor.static.windowManager.openWindow(
+			this.thankYouDialog,
+			dialogConfig
+		);
 	};
 
 	/**
@@ -152,6 +153,7 @@
 			this.constructor.static.dialog,
 			{
 				title: mw.msg( this.dialogTitleMessageKey ),
+				foreignApi: this.foreignApi,
 				settings: {
 					messagePosterPromise: this.messagePosterPromise,
 					title: this.feedbackPageTitle,
@@ -285,12 +287,12 @@
 	 */
 	mw.Feedback.Dialog.prototype.validateFeedbackForm = function () {
 		var isValid = (
-				(
-					!this.useragentMandatory ||
-					this.useragentCheckbox.isSelected()
-				) &&
-				this.feedbackSubjectInput.getValue()
-			);
+			(
+				!this.useragentMandatory ||
+				this.useragentCheckbox.isSelected()
+			) &&
+			this.feedbackSubjectInput.getValue()
+		);
 
 		this.actions.setAbilities( { submit: isValid } );
 	};
@@ -307,6 +309,24 @@
 	 */
 	mw.Feedback.Dialog.prototype.getSetupProcess = function ( data ) {
 		return mw.Feedback.Dialog.parent.prototype.getSetupProcess.call( this, data )
+			.next( function () {
+				// Get the URL of the target page, we want to use that in links in the intro
+				// and in the success dialog
+				var dialog = this;
+				if ( data.foreignApi ) {
+					return data.foreignApi.get( {
+						action: 'query',
+						prop: 'info',
+						inprop: 'url',
+						formatversion: 2,
+						titles: data.settings.title.getPrefixedText()
+					} ).then( function ( data ) {
+						dialog.feedbackPageUrl = OO.getProp( data, 'query', 'pages', 0, 'canonicalurl' );
+					} );
+				} else {
+					this.feedbackPageUrl = data.settings.title.getUrl();
+				}
+			}, this )
 			.next( function () {
 				var plainMsg, parsedMsg,
 					settings = data.settings;
@@ -321,7 +341,6 @@
 				this.setBugReportLink( settings.bugsTaskSubmissionLink );
 				this.feedbackPageTitle = settings.title;
 				this.feedbackPageName = settings.title.getNameText();
-				this.feedbackPageUrl = settings.title.getUrl();
 
 				// Useragent checkbox
 				if ( settings.useragentCheckbox.show ) {
@@ -421,14 +440,8 @@
 	 * @return {OO.ui.Error}
 	 */
 	mw.Feedback.Dialog.prototype.getErrorMessage = function () {
-		switch ( this.status ) {
-			case 'error1':
-			case 'error2':
-			case 'error3':
-			case 'error4':
-				// Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
-				return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
-		}
+		// Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
+		return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
 	};
 
 	/**