Fix the bug "A message showed in a wrong time when upload package." and modify the...

Change-Id: If5b05fbef0eedf496e50c37245826af422885693
Issue-id:GSO-18
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
index 827f13e..c161141 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
@@ -226,7 +226,11 @@
                                                        </thead>\r
                                                        <tbody ms-each-rest="resource.vimSelectItems">\r
                                                                <tr>\r
-                                                                       <td ms-text="rest.name"></td>\r
+                                                                       <td>\r
+                                                                               <div class="tdCenter">\r
+                                                                                       {{rest.name}}\r
+                                                                               </div>\r
+                                                                       </td>\r
                                                                        <td>\r
                                                                                <div class="checkbox">\r
                                                                                        <input type="radio" name="testEnvRadios" ms-attr-id="testEnvRadios{{$index}}"\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
index aa7027b..a7adcfa 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
@@ -458,4 +458,13 @@ span.status:hover {
        width:100%;\r
        table-layout: fixed;\r
        word-wrap:break-word;\r
+}\r
+\r
+.tdCenter\r
+{\r
+       display: block;\r
+       min-height: 20px;\r
+       margin-top: 10px;\r
+       margin-bottom: 10px;\r
+       text-align:center;\r
 }
\ No newline at end of file

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 3de07cb..3b2cf39 100644 (file)
--- 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
@@ -80,7 +80,7 @@ nfv-package-iui-message-upload-success=Csar package imported successfully.
 nfv-package-iui-message-upload-fail=Csar package imported failed.\r
 nfv-package-iui-message-delete-confirm=Do you want to delete the current package?\r
 nfv-package-iui-message-delete-success=Csar package deleted successfully.\r
-nfv-package-iui-message-upload-csar-exist=The package already exists, whether to re upload?\r
+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?\r
 nfv-package-iui-message-upload-csar-deletionpending=This package is referenced in an instance. whether to re upload?\r
 nfv-package-iui-message-onBoarded = Already onBoarded, no need for onBoarding.\r
 nfv-package-iui-message-onBoard-error = Onboarding error.\r

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 c694c51..9b8d10e 100644 (file)
--- 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
@@ -99,7 +99,7 @@ pmUtil.getExistPackageByName = function(name) {
     }\r
     var result = $.ajax({\r
         type : "GET",\r
-        url : vm.$restUrl.queryPackageInfoUrl + "?csarName=" + name,\r
+        url : vm.$restUrl.queryPackageInfoUrl + "?name=" + name,\r
         async: false\r
     });        \r
     var data = result.responseJSON;\r