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

This commit is contained in:
Nicolai Ort 2021-02-20 16:35:31 +00:00
commit ea7a4a560b

View File

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