Merge pull request 'Mitigated null error' (#77 ) from feature/64-dialog_clearing_bug into dev

Reviewed-on: #77
Merge branch 'dev' into feature/64-dialog_clearing_bug
2021-02-20 16:03:45 +00:00 · 2021-02-20 15:59:25 +00:00 · 2021-02-20 16:58:51 +01:00
1 changed files with 4 additions and 1 deletions
--- a/src/components/runners/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@ -45,9 +45,12 @@
  let teams = [];
  RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
    teams = val;
-    if (opened_from === "RunnerOverview") {
+    if (opened_from === "RunnerOverview" && teams.length>0) {
      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;
  $: selected_org_or_team = "";
Author	SHA1	Message	Date
Nicolai Ort	32024cf2c5	Merge pull request 'Mitigated null error' (#77 ) from feature/64-dialog_clearing_bug into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #77	2021-02-20 16:03:45 +00:00
Nicolai Ort	ef373caba7	Merge branch 'dev' into feature/64-dialog_clearing_bug	2021-02-20 15:59:25 +00:00
Nicolai Ort	396bd22199	Mitigated null error ref #64	2021-02-20 16:58:51 +01:00