jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335426 )
Change subject: Fix 'nochange' warning handling
......................................................................
Fix 'nochange' warning handling
The duplicate filename is just a string
(result.upload.warnings.exists) instead of an array
(like with result.upload.warnings.duplicate)
Bug: T156685
Change-Id: I2a5200e2b38a406e73eaf68d5de49a79cb9435d2
---
M resources/mw.UploadWizardUpload.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.UploadWizardUpload.js
b/resources/mw.UploadWizardUpload.js
index c8893a1..eaeba99 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -173,7 +173,7 @@
case 'nochange':
// This is like 'duplicate',
but also the filename is the same, which doesn't matter
if (
result.upload.warnings.exists ) {
- this.setDuplicateError(
'duplicate', result.upload.warnings.exists );
+ this.setDuplicateError(
warnCode, [ result.upload.warnings.exists ] );
}
return;
case 'duplicate-archive':
--
To view, visit https://gerrit.wikimedia.org/r/335426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a5200e2b38a406e73eaf68d5de49a79cb9435d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
