From f46e58540efc183f3033f55f34ee1fecc58fdf0a Mon Sep 17 00:00:00 2001
From: Qian Min Chen <chen.qiaomin@99cloud.net>
Date: Fri, 9 Feb 2018 17:55:25 +0800
Subject: [PATCH] Make the display of none consistent in detail page

In load balancer detail page, when the value of 'description' and
'Flavor' is None there will display a '-'. But there display 'None'
when the value of the 'Floating IP' is none.
There should be the same style in the detail page, which is easier
for the user to accept.

Change-Id: I1ffa874ca679abde27733ab4d471a42dc8a90a06
---
 .../project/lbaasv2/l7policies/l7policies.module.js         | 6 +++---
 .../dashboard/project/lbaasv2/l7rules/l7rules.module.js     | 4 ++--
 .../dashboard/project/lbaasv2/listeners/listeners.module.js | 4 ++--
 .../project/lbaasv2/loadbalancers/loadbalancers.module.js   | 4 ++--
 .../static/dashboard/project/lbaasv2/pools/pools.module.js  | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/l7policies/l7policies.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/l7policies/l7policies.module.js
index 9a28f8ff..69a9074a 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/l7policies/l7policies.module.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/l7policies/l7policies.module.js
@@ -133,7 +133,7 @@
       },
       description: {
         label: gettext('Description'),
-        filters: ['noValue']
+        filters: ['noName']
       },
       provisioning_status: {
         label: gettext('Provisioning Status'),
@@ -153,11 +153,11 @@
       },
       redirect_url: {
         label: gettext('Redirect URL'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       redirect_pool_id: {
         label: gettext('Redirect Pool ID'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       project_id: gettext('Project ID'),
       created_at: {
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/l7rules/l7rules.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/l7rules/l7rules.module.js
index 3a512cbe..923690fb 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/l7rules/l7rules.module.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/l7rules/l7rules.module.js
@@ -156,11 +156,11 @@
       },
       key: {
         label: gettext('Key'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       rule_value: {
         label: gettext('Value'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       invert: {
         label: gettext('Invert'),
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js
index 6ff8fd77..451168ba 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js
@@ -134,7 +134,7 @@
       },
       description: {
         label: gettext('Description'),
-        filters: ['noValue']
+        filters: ['noName']
       },
       provisioning_status: {
         label: gettext('Provisioning Status'),
@@ -167,7 +167,7 @@
       sni_container_refs: gettext('SNI Container Refs'),
       default_pool_id: {
         label: gettext('Default Pool ID'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       l7_policies: gettext('L7 Policies'),
       insert_headers: {
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js
index ba1690d8..b39cd9fd 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js
@@ -148,7 +148,7 @@
       },
       description: {
         label: gettext('Description'),
-        filters: ['noValue']
+        filters: ['noName']
       },
       provisioning_status: {
         label: gettext('Provisioning Status'),
@@ -184,7 +184,7 @@
       },
       floating_ip_address: {
         label: gettext('Floating IP'),
-        filters: ['noName']
+        filters: ['noValue']
       }
     };
   }
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js
index 1f884b4a..33f4e139 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js
@@ -134,7 +134,7 @@
       },
       description: {
         label: gettext('Description'),
-        filters: ['noValue']
+        filters: ['noName']
       },
       provisioning_status: {
         label: gettext('Provisioning Status'),
@@ -162,7 +162,7 @@
       },
       health_monitor_id: {
         label: gettext('Health Monitor ID'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       project_id: gettext('Project ID'),
       created_at: {