This commit is contained in:
@@ -47,8 +47,6 @@ CURRENT TODOs
|
|||||||
|
|
||||||
todo: Make functional user settings form with all overrides so can test shit out
|
todo: Make functional user settings form with all overrides so can test shit out
|
||||||
|
|
||||||
todo: Need a browser check on opening the login page that will check to ensure the browser can do the date conversions properly etc and
|
|
||||||
tell user browser is unsuitable if it isn't
|
|
||||||
|
|
||||||
todo: SEARCH UI
|
todo: SEARCH UI
|
||||||
|
|
||||||
|
|||||||
@@ -470,7 +470,6 @@ export default {
|
|||||||
lt(ltKey) {
|
lt(ltKey) {
|
||||||
return window.$gz.locale.get(ltKey);
|
return window.$gz.locale.get(ltKey);
|
||||||
},
|
},
|
||||||
|
|
||||||
getDataFromApi() {
|
getDataFromApi() {
|
||||||
var vm = this;
|
var vm = this;
|
||||||
if (vm.loading) {
|
if (vm.loading) {
|
||||||
@@ -491,6 +490,9 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
vm.loading = true;
|
vm.loading = true;
|
||||||
|
//Weird bug that causes grid to show all items selected after async method runs below to fetch data
|
||||||
|
//this puts a pin in it then resets it after the fetch is completed
|
||||||
|
var preSelected = [...vm.selected];
|
||||||
|
|
||||||
window.$gz.api
|
window.$gz.api
|
||||||
.upsert(vm.apiBaseUrl, {
|
.upsert(vm.apiBaseUrl, {
|
||||||
@@ -514,6 +516,8 @@ export default {
|
|||||||
vm.records = buildRecords(res.data, res.columns);
|
vm.records = buildRecords(res.data, res.columns);
|
||||||
vm.loading = false;
|
vm.loading = false;
|
||||||
vm.totalRecords = res.totalRecordCount;
|
vm.totalRecords = res.totalRecordCount;
|
||||||
|
//Put back selected items
|
||||||
|
vm.selected = [...preSelected];
|
||||||
|
|
||||||
//persist the paging options and listview stuff so user sees same page and list on refresh or leave and return scenario
|
//persist the paging options and listview stuff so user sees same page and list on refresh or leave and return scenario
|
||||||
saveFormSettings(vm);
|
saveFormSettings(vm);
|
||||||
@@ -531,8 +535,6 @@ export default {
|
|||||||
//loadFormSettings(vm);
|
//loadFormSettings(vm);
|
||||||
vm.loading = false;
|
vm.loading = false;
|
||||||
vm.getDataFromApi();
|
vm.getDataFromApi();
|
||||||
|
|
||||||
//vm.getDataFromApi();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user