jenkins-bot has submitted this change and it was merged.
Change subject: Pass campaign name as part of each claim
......................................................................
Pass campaign name as part of each claim
Depends on I383d403593708ca4990187a4e7f17c0c11c4ae04.
Change-Id: I9de762dc4ba50346f4b422c184872e69f7508b7e
---
M javascripts/modules/wikigrok/WikiGrokDialog.js
M javascripts/modules/wikigrok/WikiGrokDialogB.js
M javascripts/modules/wikigrok/WikiGrokResponseApi.js
M javascripts/modules/wikigrok/wikiGrokCampaigns.js
M templates/modules/wikigrok/tagButton.hogan
M tests/qunit/modules/wikigrok/test_WikiGrokResponseApi.js
6 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/wikigrok/WikiGrokDialog.js
b/javascripts/modules/wikigrok/WikiGrokDialog.js
index ccbbee0..b42f88d 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialog.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialog.js
@@ -77,8 +77,7 @@
subject: options.name,
version: this.version,
userToken: options.userToken,
- taskToken: this.defaults.taskToken,
- campaignName: options.campaign.name
+ taskToken: this.defaults.taskToken
} );
Panel.prototype.initialize.apply( this, arguments );
@@ -251,7 +250,8 @@
value: options.claimLabel,
correct: options.claimIsCorrect,
propid: options.campaign.propertyId,
- prop: options.campaign.propertyName
+ prop: options.campaign.propertyName,
+ campaign: options.campaign.name
};
this.apiWikiGrokResponse.recordClaims( [ claim ]
).done( function () {
diff --git a/javascripts/modules/wikigrok/WikiGrokDialogB.js
b/javascripts/modules/wikigrok/WikiGrokDialogB.js
index 5df88db..333d3f9 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialogB.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialogB.js
@@ -69,6 +69,7 @@
propId:
suggestion.campaign.propertyId,
itemId: suggestion.id,
readable: suggestion.label,
+ campaignName:
suggestion.campaign.name,
// replace 'instance of' with
'type'
campaignText: (
suggestion.campaign.propertyName === 'instance of' ) ?
'type' :
suggestion.campaign.propertyName,
@@ -143,7 +144,8 @@
prop: $this.data( 'propname' ),
propid: $this.data( 'propid' ),
value: $this.data( 'readable' ),
- valueid: $this.data( 'itemid' )
+ valueid: $this.data( 'itemid' ),
+ campaign: $this.data(
'campaignname' )
} );
} );
diff --git a/javascripts/modules/wikigrok/WikiGrokResponseApi.js
b/javascripts/modules/wikigrok/WikiGrokResponseApi.js
index 8a88348..00dc0ca 100644
--- a/javascripts/modules/wikigrok/WikiGrokResponseApi.js
+++ b/javascripts/modules/wikigrok/WikiGrokResponseApi.js
@@ -20,7 +20,6 @@
this.userToken = options.userToken;
this.taskToken = options.taskToken;
this.taskType = 'version ' + options.version;
- this.campaignName = options.campaignName;
this.testing = false;
Api.prototype.initialize.apply( this, arguments );
},
@@ -40,7 +39,6 @@
subject_id: this.subjectId,
subject: this.subject,
mobile_mode: M.getMode(),
- campaign_name: this.campaignName,
testing: this.testing,
claims: JSON.stringify( claims )
} );
diff --git a/javascripts/modules/wikigrok/wikiGrokCampaigns.js
b/javascripts/modules/wikigrok/wikiGrokCampaigns.js
index 83754b3..67d18b1 100644
--- a/javascripts/modules/wikigrok/wikiGrokCampaigns.js
+++ b/javascripts/modules/wikigrok/wikiGrokCampaigns.js
@@ -56,7 +56,6 @@
for ( campaignName in campaigns ) {
if ( campaigns.hasOwnProperty( campaignName ) )
{
- // let's keep campaignName, it's used
in tests, also maybe useful in other cases
campaigns[campaignName].name =
campaignName;
questions = questions.concat(
getCampaignQuestions( campaigns[campaignName] ) );
}
diff --git a/templates/modules/wikigrok/tagButton.hogan
b/templates/modules/wikigrok/tagButton.hogan
index e2dcb9e..236aa66 100644
--- a/templates/modules/wikigrok/tagButton.hogan
+++ b/templates/modules/wikigrok/tagButton.hogan
@@ -1,4 +1,5 @@
<div class="ui-tag-button mw-ui-button" id="{{id}}"
+ data-campaignname="{{campaignName}}"
data-itemid="{{itemId}}"
data-propname="{{propName}}" data-propid="{{propId}}"
data-readable="{{readable}}">
<label>{{campaignText}}</label>
diff --git a/tests/qunit/modules/wikigrok/test_WikiGrokResponseApi.js
b/tests/qunit/modules/wikigrok/test_WikiGrokResponseApi.js
index b67cb76..eeceaa4 100644
--- a/tests/qunit/modules/wikigrok/test_WikiGrokResponseApi.js
+++ b/tests/qunit/modules/wikigrok/test_WikiGrokResponseApi.js
@@ -11,20 +11,21 @@
subject: 'title',
version: 'a',
userToken: 'token',
- taskToken: 'taskToken',
- campaignName: 'testCampaign'
+ taskToken: 'taskToken'
} );
this.spy = this.sandbox.stub( Api.prototype,
'postWithToken' );
}
} );
- QUnit.test( 'recordClaims', 9, function ( assert ) {
+ QUnit.test( 'recordClaims', 8, function ( assert ) {
var callArgs,
claims = [ {
- a: 1
+ a: 1,
+ campaign: 'actor'
}, {
- b: 2
+ b: 2,
+ campaign: 'author'
} ];
this.api.recordClaims( claims );
assert.ok( this.spy.called );
@@ -37,7 +38,6 @@
assert.strictEqual( callArgs[ 1 ].subject, 'title' );
assert.strictEqual( callArgs[ 1 ].user_token, 'token' );
assert.strictEqual( callArgs[ 1 ].task_token, 'taskToken' );
- assert.strictEqual( callArgs[ 1 ].campaign_name, 'testCampaign'
);
//jscs:enable requireCamelCaseOrUpperCaseIdentifiers
} );
--
To view, visit https://gerrit.wikimedia.org/r/184013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de762dc4ba50346f4b422c184872e69f7508b7e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
