NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #194 from houdiniproject/fix_bug_with_campaign_event_ids

Browse source 
Fix bug where lack of user confirmation causes some bugs to occur
This commit is contained in:
Eric Schultz 2019-05-23 11:56:11 -05:00 committed by GitHub
commit 6f11e324f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/js/common/ajax/get_campaign_and_event_names_and_ids.js
View file

@ -6,8 +6,11 @@ module.exports = function(npo_id) {
var eventsPath = '/nonprofits/' + npo_id + '/events/name_and_id' var eventsPath = '/nonprofits/' + npo_id + '/events/name_and_id'
request.get(campaignsPath).end(function(err, resp){ request.get(campaignsPath).end(function(err, resp){
var dataResponse = []
if (!err) {
resp.body.unshift(false) resp.body.unshift(false)
let campaign_id_names = resp.body.map((i) => { dataResponse = resp.body.map((i) => {
if (i.isChildCampaign) if (i.isChildCampaign)
{ {
return {id: i.id, name: i.name + " - " + i.creator} return {id: i.id, name: i.name + " - " + i.creator}
@ -17,10 +20,17 @@ module.exports = function(npo_id) {
return {id: i.id, name: i.name} return {id: i.id, name: i.name}
} }
}) })
appl.def('campaigns.data', campaign_id_names) }
appl.def('campaigns.data', dataResponse)
}) })
request.get(eventsPath).end(function(err, resp){ request.get(eventsPath).end(function(err, resp){
var dataResponse = []
if(!err) {
resp.body.unshift(false) resp.body.unshift(false)
appl.def('events.data', resp.body) dataResponse = resp.body
}
appl.def('events.data', dataResponse)
}) })
} }