Fixed load order bug

ref #98
This commit is contained in:
Nicolai Ort 2021-03-18 17:02:04 +01:00
parent bd3ea721c3
commit c575c73764

View File

@ -38,23 +38,23 @@ import Teams from "./Teams.svelte";
data_loaded = true; data_loaded = true;
teamdata = Object.assign(teamdata, value); teamdata = Object.assign(teamdata, value);
original = Object.assign(original, value); original = Object.assign(original, value);
}); RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { orgs = val.map((r) => {
orgs = val.map((r) => { return { label: r.name, value: 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) => {
GroupContactService.groupContactControllerGetAll().then((val) => { return { label: getContactLabel(r), value: r };
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) { document.addEventListener("click", function (e) {
if ( if (