diff options
| author |   Luji <lu.ji3@zte.com.cn> | 2016-10-27 07:48:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2016-10-27 07:48:44 +0000 |
| commit | b6a010c2efb11d82f477c511169e6d84149dba8b (patch) | |
| tree | be4814549b6ca618b6af204bf7ac8760491a1571 /openo-portal | |
| parent | 82fb4afef95131c6aeb9ae119b2c8ab80371f7da (diff) | |
| parent | b08063bb31eb8e998994c270e19819ce77b06a42 (diff) | |
Merge "Fix the alert message while onboard package."
Diffstat (limited to 'openo-portal')
3 files changed, 5 insertions, 5 deletions
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties index 5b34be2a..5e9b97bf 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties @@ -82,7 +82,7 @@ nfv-package-iui-message-delete-confirm=Do you want to delete the current package nfv-package-iui-message-delete-success=Csar package deleted successfully.
nfv-package-iui-message-upload-csar-exist=There is a package in the same name, they may be the same package, whether still upload this package?
nfv-package-iui-message-upload-csar-deletionpending=This package is referenced in an instance. whether to re upload?
-nfv-package-iui-message-onBoarded = Already onBoarded, no need for onBoarding.
+nfv-package-iui-message-onBoarded = Onboarding operation successfully.
nfv-package-iui-message-onBoard-error = Onboarding error.
nfv-package-iui-message-delete-error = Package delete error.
nfv-package-iui-message-select-vim-error = Can not select more than one VIM to be test environment.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties index 1dce1392..efb19162 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties @@ -83,7 +83,7 @@ nfv-package-iui-message-delete-confirm=确定要删除当前包？ nfv-package-iui-message-delete-success=包删除成功。
nfv-package-iui-message-upload-csar-exist=存在同名包，是否继续上传？
nfv-package-iui-message-upload-csar-deletionpending=实例中引用了此包，是否重新上传？
-nfv-package-iui-message-onBoarded = 已经上载，无需再次上载。
+nfv-package-iui-message-onBoarded = 上载操作成功。
nfv-package-iui-message-onBoard-error = 上载失败。
nfv-package-iui-message-delete-error = 包删除失败。
nfv-package-iui-message-select-vim-error = 最多只能选择一个VIM做为测试环境
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js index ccd0f11b..d69be0a0 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js @@ -103,7 +103,7 @@ pmUtil.doOnBoard = function(url,param) { contentType : "application/json",
dataType : "json",
success : function(resp) {
- if(resp.data.status == "failed") {
+ if(resp != "" && resp.data.status == "failed") {
commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");
} else {
commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");
@@ -125,7 +125,7 @@ pmUtil.doNFAROnboard = function(extData) { contentType : "application/json",
dataType : "json",
success : function(resp) {
- if(resp.data.status == "failed") {
+ if(resp != "" && resp.data.status == "failed") {
commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");
} else {
commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");
@@ -144,7 +144,7 @@ pmUtil.doSSAROnboard = function(url) { url : url,
contentType : "application/json",
success : function(resp) {
- if(resp.data.status == "failed") {
+ if(resp != "" && resp.data.status == "failed") {
commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");
} else {
commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");
|