Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251307
Change subject: mw.ForeignStructuredUpload: Prevent categories and descriptions
from being duplicated
......................................................................
mw.ForeignStructuredUpload: Prevent categories and descriptions from being
duplicated
One copy would be added every time the user tried to save the file.
If they got an error and corrected it before trying again, there would
be two or more copies.
Bug: T116394
Change-Id: Ib4642d48e21d679ed675614efb29c77fa0e2c9c4
(cherry picked from commit fd9630bca2189cd676a053f69f7bf299b58304c7)
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
2 files changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/251307/1
diff --git
a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 717e2ec..8595386 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -231,8 +231,10 @@
*/
mw.ForeignStructuredUpload.BookletLayout.prototype.getText = function
() {
var language = mw.config.get( 'wgContentLanguage' );
+ this.upload.clearDescriptions();
this.upload.addDescription( language,
this.descriptionWidget.getValue() );
this.upload.setDate( this.dateWidget.getValue() );
+ this.upload.clearCategories();
this.upload.addCategories( this.categoriesWidget.getItemsData()
);
return this.upload.getText();
};
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index dd28ddd..94740eb 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -41,6 +41,13 @@
};
/**
+ * Empty the list of categories for the upload.
+ */
+ ForeignStructuredUpload.prototype.clearCategories = function () {
+ this.categories = [];
+ };
+
+ /**
* Add a description to the upload.
*
* @param {string} language The language code for the description's
language. Must have a template on the target wiki to work properly.
@@ -54,6 +61,13 @@
};
/**
+ * Empty the list of descriptions for the upload.
+ */
+ ForeignStructuredUpload.prototype.clearDescriptions = function () {
+ this.descriptions = [];
+ };
+
+ /**
* Set the date of creation for the upload.
*
* @param {Date} date
--
To view, visit https://gerrit.wikimedia.org/r/251307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4642d48e21d679ed675614efb29c77fa0e2c9c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
