diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index a20e9863..0f3a55d4 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -301,6 +301,9 @@ TESTING INFO: - direct print report from url must be tested and fixed up http://localhost:8080/viewreport/103/57 redocument as the format has changed and also update the notify code as the format has changed no longer a query string but a full path as in above + + - Test open url when not logged in + http://localhost:8080/open/34/103 - upload and test on devops - give to Joyce to mangle diff --git a/ayanova/src/components/report-control.vue b/ayanova/src/components/report-control.vue index 47099e8f..f22437c1 100644 --- a/ayanova/src/components/report-control.vue +++ b/ayanova/src/components/report-control.vue @@ -251,13 +251,12 @@ export default { if (reportDataOptions == null) { throw new Error("report-selector:Open missing reportDataOptions"); } - if (reportDataOptions.AType == null) { - throw new Error("report-selector:Open - AType is missing or empty"); - } - this.reportDataOptions = reportDataOptions; this.preSelectReportId = preSelectReportId; if (!preSelectReportId) { + if (reportDataOptions.AType == null) { + throw new Error("report-selector:Open - AType is missing or empty"); + } //get report list from server const res = await window.$gz.api.get( `report/list/${reportDataOptions.AType}` diff --git a/ayanova/src/views/ay-report-view.vue b/ayanova/src/views/ay-report-view.vue index 9e59bcd6..434f7e62 100644 --- a/ayanova/src/views/ay-report-view.vue +++ b/ayanova/src/views/ay-report-view.vue @@ -12,7 +12,7 @@ export default { data() { return {}; }, - async created() { + async mounted() { const vm = this; //open report links have url format /viewreport/[objectid]/[reportid] //path: "/viewreport/:oid/:rid", @@ -27,13 +27,13 @@ export default { } const reportDataOptions = { - ReportId: reportid, - SelectedRowIds: [objectid], + ReportId: reportId, + SelectedRowIds: [objectId], ClientMeta: window.$gz.api.reportClientMetaData() }; try { - await vm.$refs.reportSelector.open(reportDataOptions, reportid); + await vm.$refs.reportSelector.open(reportDataOptions, reportId); } catch (ex) { vm.rendering = false; window.$gz.errorHandler.handleFormError(ex, vm); diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue index 67de6d64..d99b31d6 100644 --- a/ayanova/src/views/login.vue +++ b/ayanova/src/views/login.vue @@ -585,7 +585,7 @@ export default { if (toPath != undefined) { //check if it's an open report link and if so //trigger that to open in a new window and continue on to normal home page - if (toPath.startsWith("/viewreport")) { + if (toPath.startsWith("/xxxxxxxxviewreport")) { (async function() { //open report links have a query string /viewreport?oid=[objectid]&rid=[reportid] const searchParams = new URLSearchParams(vm.$route.params.search);