Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
Showing only changes of commit 32024cf2c5 - Show all commits

View File

@ -45,9 +45,12 @@
let teams = []; let teams = [];
RunnerTeamService.runnerTeamControllerGetAll().then((val) => { RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
teams = val; teams = val;
if (opened_from === "RunnerOverview") { if (opened_from === "RunnerOverview" && teams.length>0) {
selected_org_or_team = "TEAM_" + teams[0].id; selected_org_or_team = "TEAM_" + teams[0].id;
} }
if(teams.length==0 && orgs.length>0){
selected_org_or_team = "ORG_" + orgs[0].id
}
}); });
let selected_org; let selected_org;
$: selected_org_or_team = ""; $: selected_org_or_team = "";