lfk/frontend
2
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases Wiki Activity

Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
Conversation 1 Commits 416 Files Changed 98 +15 -15
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c575c73764 - Show all commits

30
src/components/teams/TeamDetail.svelte
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 (