diff --git a/src/api/open-object-handler.js b/src/api/open-object-handler.js index e0ce8c1..df6ccae 100644 --- a/src/api/open-object-handler.js +++ b/src/api/open-object-handler.js @@ -242,6 +242,13 @@ export default { }); break; + case socktype.TrialLicenseRequest: + vm.$router.push({ + name: "trial-request-edit", + params: { recordid: tid.id } + }); + break; + case socktype.SubscriptionServer: vm.$router.push({ name: "subscription-server-edit", diff --git a/src/views/biz-trial-request.vue b/src/views/biz-trial-request.vue index ceca607..d2867e7 100644 --- a/src/views/biz-trial-request.vue +++ b/src/views/biz-trial-request.vue @@ -5,8 +5,7 @@ - - + - + - - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -296,7 +196,7 @@ export default { tags: [] }, selectLists: { - dataCenters: [] + trailRequestStatus: [] }, formState: { ready: false, @@ -568,18 +468,7 @@ async function clickHandler(menuItem) { case "save": m.vm.submit(); break; - case "delete": - m.vm.remove(); - break; - case "new": - m.vm.$router.push({ - name: "trial-request-edit", - params: { recordid: 0 } - }); - break; - case "duplicate": - m.vm.duplicate(); - break; + case "report": { const res = await m.vm.$refs.reportSelector.open( @@ -595,29 +484,7 @@ async function clickHandler(menuItem) { window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm); } break; - // case "terminal": - // alert("putty -agent -ssh sportseffect.onayanova.com"); - // break; - // case "QuoteList": - // m.vm.$router.push({ - // name: "svc-quotes", - // params: { - // aType: m.vm.sockType, - // objectId: m.vm.obj.id, - // name: m.vm.obj.name - // } - // }); - // break; - // case "PMList": - // m.vm.$router.push({ - // name: "svc-pms", - // params: { - // aType: m.vm.sockType, - // objectId: m.vm.obj.id, - // name: m.vm.obj.name - // } - // }); - // break; + default: window.$gz.eventBus.$emit( "notify-warning", @@ -673,32 +540,6 @@ function generateMenu(vm) { }); } - if (vm.rights.change) { - menuOptions.menuItems.push({ - title: "New", - icon: "$sockiPlus", - key: FORM_KEY + ":new", - vm: vm - }); - } - - if (vm.rights.change && vm.$route.params.recordid != 0) { - menuOptions.menuItems.push({ - title: "Duplicate", - icon: "$sockiClone", - key: FORM_KEY + ":duplicate", - vm: vm - }); - } - if (vm.rights.delete && vm.$route.params.recordid != 0) { - menuOptions.menuItems.push({ - title: "Delete", - icon: "$sockiTrashAlt", - surface: false, - key: FORM_KEY + ":delete", - vm: vm - }); - } menuOptions.menuItems.push({ divider: true, inset: false }); // menuOptions.menuItems.push({ @@ -734,6 +575,7 @@ let JUST_DELETED = false; async function initForm(vm) { await fetchTranslatedText(); await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm); + await populateSelectionLists(vm); } ////////////////////////////////////////////////////////// @@ -753,9 +595,20 @@ async function fetchTranslatedText() { "TrialLicenseRequestStatus", "TrialLicenseRequestRejectReason", "TrialLicenseRequestFetchedOn", - "TrialLicenseRequestPerpetual" + "TrialLicenseRequestPerpetual", + "LicenseKey" ]); } +////////////////////// +// +// +async function populateSelectionLists(vm) { + //ensure the pick lists required are pre-fetched + await window.$gz.enums.fetchEnumList("trialrequeststatus"); + vm.selectLists.trailRequestStatus = window.$gz.enums.getSelectionList( + "trialrequeststatus" + ); +} /* "CREATE TABLE atriallicenserequest (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, dbid TEXT NOT NULL, companyname TEXT NOT NULL, " + "contactname TEXT NOT NULL, email TEXT NOT NULL, emailconfirmcode TEXT NOT NULL, emailvalidated BOOL DEFAULT false, "