Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73203
Change subject: mw.ViewPageTarget: Improve error message for badtoken error
......................................................................
mw.ViewPageTarget: Improve error message for badtoken error
Previously all it did was surface api response error.info,
which surfaced underneath the edit summary form as mere:
"Error: Invalid token".
Bug: 50424
Change-Id: I60169b42701ae3b88e54626c4ff7050549e6ef55
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
3 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/03/73203/1
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index 1e18437..96a202d 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -141,6 +141,7 @@
'visualeditor-reference-search-reuse' => 'Use an existing source',
'visualeditor-referencelist-isempty' => 'There are no references with
the group "$1" on this page.',
'visualeditor-referencelist-missingref' => 'This reference is defined
in a template or other generated block, and for now can only be edited in
source mode.',
+ 'visualeditor-savedialog-error-badtoken' => 'We could not process your
edit due to your sesion having been expired.',
'visualeditor-savedialog-label-create' => 'Create page',
'visualeditor-savedialog-label-error' => 'Error',
'visualeditor-savedialog-label-report' => 'Report problem',
@@ -417,6 +418,7 @@
See also:
* {{msg-mw|Visualeditor-dialog-meta-languages-readonlynote}}',
+ 'visualeditor-savedialog-error-badtoken' => 'Error displayed in the
save dialog if saving the edit failued due to an invalid edit token (likely due
to the user having logged out in a separate window, or logged in again)',
'visualeditor-savedialog-label-create' => 'Label text for save button
when the user is creating a new page',
'visualeditor-savedialog-label-error' => 'Label in front of a save
dialog error sentence, separated by {{msg-mw|colon-separator}}.
{{Identical|Error}}',
diff --git a/VisualEditor.php b/VisualEditor.php
index 0ab1def..ed239a6 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -673,6 +673,7 @@
'visualeditor-reference-search-reuse',
'visualeditor-referencelist-isempty',
'visualeditor-referencelist-missingref',
+ 'visualeditor-savedialog-error-badtoken',
'visualeditor-savedialog-label-create',
'visualeditor-savedialog-label-error',
'visualeditor-savedialog-label-report',
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index fffd4df..a239f3a 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -485,6 +485,20 @@
return;
}
+ // Handle token errors
+ if ( data.error && data.error.code === 'badtoken' ) {
+ this.showMessage(
+ 'api-save-error',
+ document.createTextNode( mw.msg(
'visualeditor-savedialog-error-badtoken' ) ),
+ {
+ wrap: 'error'
+ }
+ );
+ this.saveDialogSaveButton.setDisabled( true );
+ return;
+ }
+
+
// Handle (other) unknown and/or unrecoverable errors
this.showMessage(
'api-save-error',
--
To view, visit https://gerrit.wikimedia.org/r/73203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60169b42701ae3b88e54626c4ff7050549e6ef55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
