This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
commit 4ae24ea64050045efdabdadc0e0ab83dfad3b03a Author: Rohit Yadav <[email protected]> AuthorDate: Mon Nov 4 12:53:01 2019 +0530 config: fix duplicate route definition issue Signed-off-by: Rohit Yadav <[email protected]> --- src/config/section/image.js | 2 +- src/config/section/offering.js | 2 +- src/views/offering/AddComputeOffering.vue | 2 +- src/views/offering/AddSystemOffering.vue | 40 ------------------------------- 4 files changed, 3 insertions(+), 43 deletions(-) diff --git a/src/config/section/image.js b/src/config/section/image.js index 937ff9a..c0fdd16 100644 --- a/src/config/section/image.js +++ b/src/config/section/image.js @@ -48,7 +48,7 @@ export default { args: ['url', 'name', 'displaytext', 'directdownload', 'zoneids', 'hypervisor', 'format', 'ostypeid', 'checksum', 'isextractable', 'passwordenabled', 'sshkeyenabled', 'isdynamicallyscalable', 'ispublic', 'isfeatured', 'isrouting', 'requireshvm'] }, { - api: 'getUploadParamsForVolume', + api: 'getUploadParamsForTemplate', icon: 'cloud-upload', label: 'Upload Local Template', listView: true, diff --git a/src/config/section/offering.js b/src/config/section/offering.js index 66f1aee..58b6a41 100644 --- a/src/config/section/offering.js +++ b/src/config/section/offering.js @@ -64,7 +64,7 @@ export default { listView: true, params: { 'issystem': 'true' }, popup: true, - component: () => import('@/views/offering/AddSystemOffering.vue') + component: () => import('@/views/offering/AddComputeOffering.vue') }, { api: 'updateServiceOffering', icon: 'edit', diff --git a/src/views/offering/AddComputeOffering.vue b/src/views/offering/AddComputeOffering.vue index 9762395..e4a769f 100644 --- a/src/views/offering/AddComputeOffering.vue +++ b/src/views/offering/AddComputeOffering.vue @@ -17,7 +17,7 @@ <template> <div> - + This must also check and handle for add system offering as it's the same API </div> </template> diff --git a/src/views/offering/AddSystemOffering.vue b/src/views/offering/AddSystemOffering.vue deleted file mode 100644 index 9762395..0000000 --- a/src/views/offering/AddSystemOffering.vue +++ /dev/null @@ -1,40 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -<template> - <div> - - </div> -</template> - -<script> - -export default { - name: '', - components: { - }, - data () { - return { - } - }, - methods: { - } -} -</script> - -<style scoped> -</style>
