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

Merge branch 'dev' into feature/62-contract-generation

Browse Source
This commit is contained in:
Nicolai Ort 2021-02-20 16:35:31 +00:00
commit ea7a4a560b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/runners/ImportRunnerModal.svelte
View File

@ -20,6 +20,7 @@
$: searchvalue = ""; $: searchvalue = "";
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
function cancelModal() { function cancelModal() {
json_output = [];
import_modal_open = false; import_modal_open = false;
dispatch("cancel"); dispatch("cancel");
} }
@ -37,10 +38,19 @@
let orgs = []; let orgs = [];
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
orgs = val; orgs = val;
if(opened_from === 'OrgOverview'){
selected_org = orgs[0].id
}
}); });
let teams = []; let teams = [];
RunnerTeamService.runnerTeamControllerGetAll().then((val) => { RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
teams = val; teams = val;
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; let selected_org;
$: selected_org_or_team = ""; $: selected_org_or_team = "";
@ -347,7 +357,6 @@
</button> </button>
<button <button
on:click={() => { on:click={() => {
json_output = [];
cancelModal(); cancelModal();
}} }}
type="button" type="button"