From c575c7376499be07980cb4dbdb7a177e0a18e29c Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Mar 2021 17:02:04 +0100 Subject: [PATCH] Fixed load order bug ref #98 --- src/components/teams/TeamDetail.svelte | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/teams/TeamDetail.svelte b/src/components/teams/TeamDetail.svelte index 0c7f42da..f3a15cb9 100644 --- a/src/components/teams/TeamDetail.svelte +++ b/src/components/teams/TeamDetail.svelte @@ -38,23 +38,23 @@ import Teams from "./Teams.svelte"; data_loaded = true; teamdata = Object.assign(teamdata, value); original = Object.assign(original, value); - }); - RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { - orgs = val.map((r) => { - return { label: r.name, value: r }; + RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { + orgs = val.map((r) => { + return { label: r.name, value: r }; + }); + group = orgs.find((g) => g.value.id == teamdata.parentGroup.id); }); - group = orgs.find((g) => g.value.id == teamdata.parentGroup.id); - }); - GroupContactService.groupContactControllerGetAll().then((val) => { - contacts = val.map((r) => { - return { label: getContactLabel(r), value: r }; + GroupContactService.groupContactControllerGetAll().then((val) => { + contacts = val.map((r) => { + return { label: getContactLabel(r), value: r }; + }); + if(teamdata.contact){ + contact = contacts.find((g) => g.value.id == teamdata.contact.id); + } + else{ + contact = null; + } }); - if(teamdata.contact){ - contact = contacts.find((g) => g.value.id == teamdata.contact.id); - } - else{ - contact = null; - } }); document.addEventListener("click", function (e) { if (