Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184013
Change subject: Pass campaign name as part of each claim
......................................................................
Pass campaign name as part of each claim
Change-Id: I9de762dc4ba50346f4b422c184872e69f7508b7e
---
M javascripts/modules/wikigrok/WikiGrokDialogB.js
M javascripts/modules/wikigrok/WikiGrokResponseApi.js
M javascripts/modules/wikigrok/wikiGrokCampaigns.js
M templates/modules/wikigrok/tagButton.hogan
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/13/184013/1
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>
--
To view, visit https://gerrit.wikimedia.org/r/184013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9de762dc4ba50346f4b422c184872e69f7508b7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
