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

Merge branch 'dev' into feature/69-translation-keys

Browse Source 
# Conflicts:
#	src/components/orgs/OrgDetail.svelte
#	src/components/runners/RunnersOverview.svelte
This commit is contained in:
Nicolai Ort
2021-02-19 18:23:38 +01:00
parent d67dfdf2e7 afd73d53be
commit d53c1ae2bd
6 changed files with 558 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/contacts/ContactDetail.svelte
View File

@@ -31,7 +31,7 @@
isEmailValid &&
isPhoneValidOrEmpty &&
((isAddress1Valid && iszipcodevalid && iscityvalid) ||
address_checked === false);
editable.address_checked === false);
const promise = GroupContactService.groupContactControllerGetOne(
params.contact
).then((data) => {
@@ -42,6 +42,15 @@
original_data.groups = original_data.groups.map((g) => g.id);
editable.address_checked = editable.address.address1 !== null;
original_data.address_checked = editable.address.address1 !== null;
if(editable.address_checked===false){
editable.address = {
address1: "",
address2: "",
city: "",
postalcode: "",
country: ""
}
}
});
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
orgs = val;
@@ -64,7 +73,7 @@
}).showToast();
editable.address.country = "DE";
if (editable.address_checked === false) {
editable.address = {};
editable.address = null;
}
if (editable.email) editable.email = editable.email;
if (editable.phone) editable.phone = editable.phone;