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
The following commit(s) were added to refs/heads/master by this push:
new b678a24 infra: fix getDiagnostics response display (#312)
b678a24 is described below
commit b678a24bc08029f4687ca3b1ce0415949da41701
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Thu Apr 30 01:41:01 2020 +0530
infra: fix getDiagnostics response display (#312)
Fixes #201
Fixes #202
Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
src/config/section/infra/routers.js | 3 ++-
src/config/section/infra/systemVms.js | 3 ++-
src/views/AutogenView.vue | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/config/section/infra/routers.js
b/src/config/section/infra/routers.js
index 92db3c8..a031005 100644
--- a/src/config/section/infra/routers.js
+++ b/src/config/section/infra/routers.js
@@ -102,7 +102,8 @@ export default {
targetid: {
value: (record) => { return record.id }
}
- }
+ },
+ response: (result) => { return result && result.diagnostics &&
result.diagnostics.url ? `Please click the link to download the retrieved
diagnostics: <p><a
href='${result.diagnostics.url}'>${result.diagnostics.url}</a></p>` : 'Invalid
response' }
},
{
api: 'destroyRouter',
diff --git a/src/config/section/infra/systemVms.js
b/src/config/section/infra/systemVms.js
index 67597b4..380bb30 100644
--- a/src/config/section/infra/systemVms.js
+++ b/src/config/section/infra/systemVms.js
@@ -93,7 +93,8 @@ export default {
targetid: {
value: (record) => { return record.id }
}
- }
+ },
+ response: (result) => { return result && result.diagnostics &&
result.diagnostics.url ? `Please click the link to download the retrieved
diagnostics: <p><a
href='${result.diagnostics.url}'>${result.diagnostics.url}</a></p>` : 'Invalid
response' }
},
{
api: 'destroySystemVm',
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 1bbfad6..8f74680 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -646,7 +646,7 @@ export default {
const description = action.response(result.jobresult)
if (description) {
this.$notification.info({
- message: action.label,
+ message: this.$t(action.label),
description: (<span domPropsInnerHTML={description}></span>),
duration: 0
})
