jenkins-bot has submitted this change and it was merged.
Change subject: Fix: Add qualifier does not disappear when a new statement is
saved
......................................................................
Fix: Add qualifier does not disappear when a new statement is saved
Bug: T128317
Change-Id: I669f81283318f8677708cd82fa52a08c5d31b3d3
(cherry picked from commit 60163b28dee02569133888c1d5a6ad03f2340e25)
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 24 insertions(+), 13 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 93e1cae..1e93a12 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -464,11 +464,17 @@
: wb.datamodel.Statement.RANK.NORMAL
);
this._createMainSnak();
- this._createQualifiersListview(
- this.options.value
- ? this.options.value.getClaim().getQualifiers()
- : new wb.datamodel.SnakList()
- );
+
+ if ( this.isInEditMode()
+ || this.options.value
+ &&
this.options.value.getClaim().getQualifiers().length
+ ) {
+ this._createQualifiersListview(
+ this.options.value
+ ?
this.options.value.getClaim().getQualifiers()
+ : new wb.datamodel.SnakList()
+ );
+ }
this._createReferencesListview(
this.options.value ?
this.options.value.getReferences().toArray() : []
);
@@ -551,12 +557,15 @@
* @return {wikibase.datamodel.SnakList}
*/
_getQualifiers: function() {
- var qualifiers = new wb.datamodel.SnakList(),
- snaklistviews = this._qualifiers.value();
+ var qualifiers = new wb.datamodel.SnakList();
- // Combine qualifiers grouped by property to a single SnakList:
- for ( var i = 0; i < snaklistviews.length; i++ ) {
- qualifiers.merge( snaklistviews[i].value() );
+ if ( this._qualifiers ) {
+ var snaklistviews = this._qualifiers.value();
+
+ // Combine qualifiers grouped by property to a single
SnakList:
+ for ( var i = 0; i < snaklistviews.length; i++ ) {
+ qualifiers.merge( snaklistviews[i].value() );
+ }
}
return qualifiers;
@@ -714,8 +723,10 @@
var qualifiers = this.options.value ?
this.options.value.getClaim().getQualifiers() : [];
- // Refill the qualifier listview with the initial (or new
initial) qualifiers:
- this._createQualifiersListview( qualifiers );
+ if ( qualifiers.length > 0 ) {
+ // Refill the qualifier listview with the initial (or
new initial) qualifiers:
+ this._createQualifiersListview( qualifiers );
+ }
},
/**
@@ -768,7 +779,7 @@
}
return this._mainSnakSnakView.isValid() &&
- this._listViewIsValid( this._qualifiers ) &&
+ ( !this._qualifiers || this._listViewIsValid(
this._qualifiers ) ) &&
this._listViewIsValid( this._referencesListview ) &&
this._instantiateStatement( null ) instanceof
wb.datamodel.Statement;
},
--
To view, visit https://gerrit.wikimedia.org/r/278963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I669f81283318f8677708cd82fa52a08c5d31b3d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.27.0-wmf.16
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
