Merge pull request 'Small bugfixes - feature/64-dialog_clearing_bug' (#75) from feature/64-dialog_clearing_bug into dev
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #75 close #64
This commit is contained in:
commit
4bff50a088
|
@ -20,6 +20,7 @@
|
|||
$: searchvalue = "";
|
||||
const dispatch = createEventDispatcher();
|
||||
function cancelModal() {
|
||||
json_output = [];
|
||||
import_modal_open = false;
|
||||
dispatch("cancel");
|
||||
}
|
||||
|
@ -37,10 +38,16 @@
|
|||
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") {
|
||||
selected_org_or_team = "TEAM_" + teams[0].id;
|
||||
}
|
||||
});
|
||||
let selected_org;
|
||||
$: selected_org_or_team = "";
|
||||
|
@ -347,7 +354,6 @@
|
|||
</button>
|
||||
<button
|
||||
on:click={() => {
|
||||
json_output = [];
|
||||
cancelModal();
|
||||
}}
|
||||
type="button"
|
||||
|
|
Loading…
Reference in New Issue
Block a user