Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260585
Change subject: Use common baserevid for label and description changes [WIP]
......................................................................
Use common baserevid for label and description changes [WIP]
I am not sure the reason we stored separate revision ids
for different parts of the entity.
Unless we have good reason, then I think RevisionStore
should just store a single baserevid.
Bug: T121395
Change-Id: Ie37188862505e4c363650e434f092b44bc678143
---
M view/resources/wikibase/entityChangers/DescriptionsChanger.js
M view/resources/wikibase/entityChangers/LabelsChanger.js
M view/resources/wikibase/wikibase.RevisionStore.js
3 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/260585/1
diff --git a/view/resources/wikibase/entityChangers/DescriptionsChanger.js
b/view/resources/wikibase/entityChangers/DescriptionsChanger.js
index 3c73bd9..162de1d 100644
--- a/view/resources/wikibase/entityChangers/DescriptionsChanger.js
+++ b/view/resources/wikibase/entityChangers/DescriptionsChanger.js
@@ -48,7 +48,7 @@
this._api.setDescription(
this._entity.getId(),
- this._revisionStore.getDescriptionRevision(),
+ this._revisionStore.getBaseRevision(),
description.getText(),
language
)
@@ -56,7 +56,7 @@
var savedDescription =
result.entity.descriptions[language].value;
// Update revision store:
- self._revisionStore.setDescriptionRevision(
result.entity.lastrevid );
+ self._revisionStore.setBaseRevision(
result.entity.lastrevid );
// FIXME: Maybe check API's return value?
diff --git a/view/resources/wikibase/entityChangers/LabelsChanger.js
b/view/resources/wikibase/entityChangers/LabelsChanger.js
index f1d6b96..2d08332 100644
--- a/view/resources/wikibase/entityChangers/LabelsChanger.js
+++ b/view/resources/wikibase/entityChangers/LabelsChanger.js
@@ -48,7 +48,7 @@
this._api.setLabel(
this._entity.getId(),
- this._revisionStore.getLabelRevision(),
+ this._revisionStore.getBaseRevision(),
label.getText(),
language
)
@@ -56,7 +56,7 @@
var savedLabel =
result.entity.labels[language].value;
// Update revision store:
- self._revisionStore.setLabelRevision(
result.entity.lastrevid );
+ self._revisionStore.setBaseRevision(
result.entity.lastrevid );
// FIXME: Maybe check API's return value?
diff --git a/view/resources/wikibase/wikibase.RevisionStore.js
b/view/resources/wikibase/wikibase.RevisionStore.js
index 5f2bc7e..d464892 100644
--- a/view/resources/wikibase/wikibase.RevisionStore.js
+++ b/view/resources/wikibase/wikibase.RevisionStore.js
@@ -74,6 +74,13 @@
},
/**
+ * Saves the base revision id
+ */
+ setBaseRevision: function( rev ) {
+ this._revisions.baseRevision = rev;
+ },
+
+ /**
* Saves the label revision id.
*/
setLabelRevision: function( rev ) {
--
To view, visit https://gerrit.wikimedia.org/r/260585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie37188862505e4c363650e434f092b44bc678143
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
