This commit is contained in:
2020-06-20 13:21:04 +00:00
parent 7a99adfb4c
commit 727cb6d234
19 changed files with 72 additions and 243 deletions

View File

@@ -746,18 +746,9 @@ async function fetchEnums(columnData) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await populateSelectionLists(vm);
await loadFormSettings(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await populateSelectionLists(vm);
await loadFormSettings(vm);
}
////////////////////

View File

@@ -435,18 +435,9 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -69,17 +69,8 @@ export default {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -556,29 +556,20 @@ function generateMenu(vm) {
//
//
async function initForm(vm) {
return new Promise(async function(resolve, reject) {
// (async function() {
try {
await fetchTranslatedText(vm);
let res = await window.$gz.api.get("license");
//We never expect there to be no data here
if (!res.data) {
throw res;
}
vm.currentLicenseInfo = res.data.license;
await fetchTranslatedText(vm);
let res = await window.$gz.api.get("license");
//We never expect there to be no data here
if (!res.data) {
throw res;
}
vm.currentLicenseInfo = res.data.license;
res = await window.$gz.api.get("license/database-empty");
//We never expect there to be no data here
if (!res.data) {
throw res;
}
vm.dbIsEmpty = res.data;
} catch (err) {
reject(err);
}
resolve();
// })();
});
res = await window.$gz.api.get("license/database-empty");
//We never expect there to be no data here
if (!res.data) {
throw res;
}
vm.dbIsEmpty = res.data;
}
//////////////////////////////////////////////////////////

View File

@@ -250,19 +250,10 @@ function clickHandler(menuItem) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await getServerInfo(vm);
await getBrowserInfo(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await getServerInfo(vm);
await getBrowserInfo(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -80,7 +80,7 @@ export default {
async created() {
let vm = this;
try {
await initForm(vm);
await initForm(vm);
vm.formState.readOnly = !vm.rights.change;
window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -311,20 +311,11 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
await ensureTemplateIsInStore(vm);
await initDataObject(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
await ensureTemplateIsInStore(vm);
await initDataObject(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -924,23 +924,14 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
await populateFieldDefinitions(vm);
await fetchTranslatedFieldNames(vm);
await setEffectiveListView(vm);
await initDataObject(vm);
await fetchEnums(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
await populateFieldDefinitions(vm);
await fetchTranslatedFieldNames(vm);
await setEffectiveListView(vm);
await initDataObject(vm);
await fetchEnums(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -282,18 +282,9 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(async function(resolve, reject) {
// (async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
// })();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -362,19 +362,10 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateAyaTypeList(vm);
await populateEventTypeList(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateAyaTypeList(vm);
await populateEventTypeList(vm);
}
//////////////////////
//

View File

@@ -288,17 +288,8 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -345,18 +345,9 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -403,18 +403,9 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -399,17 +399,8 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -234,17 +234,8 @@ function clickHandler(menuItem) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -191,18 +191,9 @@ function clickHandler(menuItem) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -501,18 +501,9 @@ function clickHandler(menuItem) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await populateSelectionLists(vm);
}
/////////////////////////////////

View File

@@ -131,17 +131,8 @@ function clickHandler(menuItem) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -267,17 +267,8 @@ function generateMenu(vm) {
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
}
//////////////////////////////////////////////////////////

View File

@@ -719,19 +719,10 @@ let JUST_DELETED = false;
/////////////////////////////////
//
//
function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await fetchTranslatedText(vm);
await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY);
await populateSelectionLists(vm);
} catch (err) {
reject(err);
}
resolve();
})();
});
async function initForm(vm) {
await fetchTranslatedText(vm);
await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY);
await populateSelectionLists(vm);
}
//////////////////////////////////////////////////////////