From 9c3d01a77cdbd64843afc81491f39bdfe1293672 Mon Sep 17 00:00:00 2001
From: Ying Zuo <yinzuo@cisco.com>
Date: Sun, 3 Sep 2017 21:22:01 -0700
Subject: [PATCH] Fix warning message not showing on launch instance modal

The warning message should be shown when hovering over the
warning icon on launch instance modal.

Updated the name and attribute of the popover directive.

Change-Id: Ida5b7aad33c6024d8bdd1ea6d1cb2b35b9fd6ba6
Closes-bug: #1713591
---
 .../launch-instance/flavor/flavor.html        | 24 +++++++++----------
 .../launch-instance/source/source.html        |  8 +++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/flavor/flavor.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/flavor/flavor.html
index b18b545991..35e2b9ce51 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/flavor/flavor.html
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/flavor/flavor.html
@@ -54,26 +54,26 @@ limitations under the License.
         <td class="rsp-p1">
           <span class="invalid fa fa-exclamation-triangle"
           ng-show="item.errors.vcpus"
-          popover="{$ item.errors.vcpus $}"
+          uib-popover="{$ item.errors.vcpus $}"
           popover-placement="top" popover-append-to-body="true"
-          popover-trigger="mouseenter mouseleave"/>
+          popover-trigger="'mouseenter'"/>
           {$ ::item.vcpus $}
         </td>
         <td class="rsp-p1">
           <span class="invalid fa fa-exclamation-triangle"
             ng-show="item.errors.ram"
-            popover="{$ item.errors.ram $}"
+            uib-popover="{$ item.errors.ram $}"
             popover-placement="top" popover-append-to-body="true"
-            popover-trigger="mouseenter mouseleave"/>
+            popover-trigger="'mouseenter'"/>
           {$ ::item.ram | mb $}
         </td>
         <td class="rsp-p1">{$ ::item.totalDisk | gb $}</td>
         <td class="rsp-p2">
           <span class="invalid fa fa-exclamation-triangle"
             ng-show="item.errors.disk"
-            popover="{$ item.errors.disk $}"
+            uib-popover="{$ item.errors.disk $}"
             popover-placement="top" popover-append-to-body="true"
-            popover-trigger="mouseenter mouseleave"/>
+            popover-trigger="'mouseenter'"/>
           {$ ::item.rootDisk | gb $}
         </td>
         <td class="rsp-p2">{$ ::item.ephemeralDisk | gb $}</td>
@@ -175,26 +175,26 @@ limitations under the License.
         <td class="rsp-p1">
           <span class="invalid fa fa-exclamation-triangle"
           ng-show="item.errors.vcpus"
-          popover="{$ item.errors.vcpus $}"
+          uib-popover="{$ item.errors.vcpus $}"
           popover-placement="top" popover-append-to-body="true"
-          popover-trigger="mouseenter mouseleave"/>
+          popover-trigger="'mouseenter'"/>
           {$ ::item.vcpus $}
         </td>
         <td class="rsp-p1">
           <span class="invalid fa fa-exclamation-triangle"
             ng-show="item.errors.ram"
-            popover="{$ item.errors.ram $}"
+            uib-popover="{$ item.errors.ram $}"
             popover-placement="top" popover-append-to-body="true"
-            popover-trigger="mouseenter mouseleave"/>
+            popover-trigger="'mouseenter'"/>
           {$ ::item.ram | mb $}
         </td>
         <td class="rsp-p1">{$ ::item.totalDisk | gb $}</td>
         <td class="rsp-p2">
           <span class="invalid fa fa-exclamation-triangle"
             ng-show="item.errors.disk"
-            popover="{$ item.errors.disk $}"
+            uib-popover="{$ item.errors.disk $}"
             popover-placement="top" popover-append-to-body="true"
-            popover-trigger="mouseenter mouseleave"/>
+            popover-trigger="'mouseenter'"/>
           {$ ::item.rootDisk | gb $}
         </td>
         <td class="rsp-p2">{$ ::item.ephemeralDisk | gb $}</td>
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html
index 70c248d253..5551b70d0f 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html
@@ -162,8 +162,8 @@
             <td ng-class="ctrl.tableBodyCells[4].classList">
               <span ng-if="model.newInstanceSpec.source_type.type === 'volume' && row.availability_zone !== model.newInstanceSpec.availability_zone"
                     class="invalid fa fa-exclamation-triangle"
-                    popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
-                    popover-trigger="mouseenter mouseleave"
+                    uib-popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
+                    popover-trigger="'mouseenter'"
                     popover-append-to-body="true"
                     popover-placement="top"></span>
               {$ ctrl.tableBodyCells[4].filter ? ctrl.tableBodyCells[4].filter(row[ctrl.tableBodyCells[4].key], ctrl.tableBodyCells[4].filterArg) : row[ctrl.tableBodyCells[4].key] $}
@@ -262,8 +262,8 @@
               <td ng-class="ctrl.tableBodyCells[4].classList">
                 <span ng-if="model.newInstanceSpec.source_type.type === 'volume' && row.availability_zone !== model.newInstanceSpec.availability_zone"
                       class="invalid fa fa-exclamation-triangle"
-                      popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
-                      popover-trigger="mouseenter mouseleave"
+                      uib-popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
+                      popover-trigger="'mouseenter'"
                       popover-append-to-body="true"
                       popover-placement="top"></span>
                 {$ ctrl.tableBodyCells[4].filter ? ctrl.tableBodyCells[4].filter(row[ctrl.tableBodyCells[4].key], ctrl.tableBodyCells[4].filterArg) : row[ctrl.tableBodyCells[4].key] $}