diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js index edcb3d36..66df92ad 100644 --- a/ayanova/src/api/gzapi.js +++ b/ayanova/src/api/gzapi.js @@ -284,6 +284,7 @@ export default { // GET DATA FROM API SERVER // get(route) { + console.log("gzapi::get(" + route + ")"); var that = this; return new Promise(function getDataFromServer(resolve, reject) { fetch(that.APIUrl(route), that.fetchGetOptions()) diff --git a/ayanova/src/views/ay-sort-filter.vue b/ayanova/src/views/ay-sort-filter.vue index cf6b6a56..5aaa7008 100644 --- a/ayanova/src/views/ay-sort-filter.vue +++ b/ayanova/src/views/ay-sort-filter.vue @@ -48,7 +48,7 @@ item-text="name" item-value="id" :label="lt('GridFilterName')" - @change="filterSelected(item)" + @change="filterChanged()" > @@ -74,17 +74,19 @@ export default { }, beforeCreate() { var vm = this; + vm.dataListKey = this.$route.params.dataListKey; + vm.recordid = this.$route.params.recordid; + //debugger; + initForm(vm) + .then(() => { + vm.formState.ready = true; + }) + .catch(err => { + debugger; - var vv = initForm(this); - - vv.then(() => { - vm.formState.ready = true; - }).catch(err => { - debugger; - - vm.formState.ready = true; - window.$gz.errorHandler.handleFormError(err); - }); + vm.formState.ready = true; + window.$gz.errorHandler.handleFormError(err); + }); }, beforeRouteLeave(to, from, next) { //var vm = this; @@ -114,8 +116,8 @@ export default { data() { return { obj: [], - recordid: this.$route.params.recordid, - dataListKey: this.$route.params.dataListKey, + recordid: undefined, + dataListKey: "", concurrencyToken: undefined, formCustomTemplateKey: this.$route.params.formCustomTemplateKey, selectedDataListSortFilter: {}, @@ -157,7 +159,7 @@ export default { this.formState.dirty = true; enableSaveButton(); }, - filterSelected: function(item) { + filterChanged: function() { alert("STUB:FILTER SELECTED"); // //nothing to scan here just set form dirty // this.formState.dirty = true; @@ -329,9 +331,6 @@ function populatePickLists(vm) { vm.pickLists.availableDataListSortFilters = res.data; } }); - // return window.$gz.formCustomTemplate.get( - // vm.$route.params.formCustomTemplateKey - // ); } ////////////////////