Delete instance,volume,etc confirmation is missing name or ID

If click the name link and go into the details page for the instance, volume, etc.
And attempt to delete. It will pop up a message, but omit the name/id.
Need to add the property of 'data-display' in detail page.

Change-Id: I9c1966dc7942a27903237e2786edbcd2fbd936ea
Closes-Bug: #1680329

openstack_dashboard/dashboards/admin/floating_ips/templates/floating_ips/detail.html

@@ -17,7 +17,7 @@
     <dd>{{ floating_ip.tenant_id|default:"-" }}</dd>
 
     <dt>{% trans "Floating IP address" %}</dt>
-    <dd>{{ floating_ip.ip|default:_("None") }}</dd>
+    <dd data-display="{{ floating_ip.ip|default:floating_ip.id }}">{{ floating_ip.ip|default:_("None") }}</dd>
     <dt>{% trans "Status" %}</dt>
     <dd>{{ floating_ip.status|default:_("None") }}</dd>
 

openstack_dashboard/dashboards/admin/networks/agents/tables.py

@@ -100,6 +100,9 @@ class DHCPAgentsTable(tables.DataTable):
                                         filters=(utils_filters.parse_isotime,
                                                  filters.timesince))
 
+    def get_object_display(self, agent):
+        return agent.host
+
     class Meta(object):
         name = "agents"
         verbose_name = _("DHCP Agents")

openstack_dashboard/dashboards/admin/networks/subnets/tables.py

@@ -113,7 +113,7 @@ class SubnetsTable(tables.DataTable):
     failure_url = reverse_lazy('horizon:admin:networks:index')
 
     def get_object_display(self, subnet):
-        return subnet.id
+        return subnet.name_or_id
 
     @memoized.memoized_method
     def _get_network(self):

openstack_dashboard/dashboards/admin/networks/tables.py

@@ -110,6 +110,9 @@ class NetworksTable(tables.DataTable):
                                 verbose_name=_("Admin State"),
                                 display_choices=DISPLAY_CHOICES)
 
+    def get_object_display(self, network):
+        return network.name_or_id
+
     class Meta(object):
         name = "networks"
         verbose_name = _("Networks")

openstack_dashboard/dashboards/identity/projects/templates/projects/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Project Name" %}</dt>
-    <dd>{{ project.name }}</dd>
+    <dd data-display="{{ project.name|default:project.id }}">{{ project.name }}</dd>
     <dt>{% trans "Project ID" %}</dt>
     <dd>{{ project.id }}</dd>
     <dt>{% trans "Enabled" %}</dt>

openstack_dashboard/dashboards/identity/users/templates/users/_detail_overview.html

@@ -11,7 +11,7 @@
       <dd>{{ domain_name }}</dd>
     {% endif %}
     <dt>{% trans "User Name" %}</dt>
-    <dd>{{ user.name }}</dd>
+    <dd data-display="{{ user.name|default:user.id }}">{{ user.name }}</dd>
     {% if description %}
       <dt>{% trans "Description" %}</dt>
       <dd>{{ description }}</dd>

openstack_dashboard/dashboards/project/backups/templates/backups/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ backup.name }}</dd>
+    <dd data-display="{{ backup.name|default:backup.id }}">{{ backup.name }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ backup.id }}</dd>
     {% if backup.description %}

openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ cg_snapshot.name }}</dd>
+    <dd data-display="{{ cg_snapshot.name|default:cg_snapshot.id }}">{{ cg_snapshot.name }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ cg_snapshot.id }}</dd>
     {% if cg_snapshot.description %}

openstack_dashboard/dashboards/project/firewalls/tables.py

@@ -318,6 +318,9 @@ class RulesTable(tables.DataTable):
                                        link=get_policy_link,
                                        verbose_name=_("In Policy"))
 
+    def get_object_display(self, rule):
+        return rule.name_or_id
+
     class Meta(object):
         name = "rulestable"
         verbose_name = _("Rules")
@@ -341,6 +344,9 @@ class PoliciesTable(tables.DataTable):
                             verbose_name=_("Audited"),
                             filters=(filters.yesno, filters.capfirst))
 
+    def get_object_display(self, policy):
+        return policy.name_or_id
+
     class Meta(object):
         name = "policiestable"
         verbose_name = _("Policies")
@@ -391,6 +397,9 @@ class FirewallsTable(tables.DataTable):
                                 verbose_name=_("Admin State"),
                                 display_choices=ADMIN_STATE_DISPLAY_CHOICES)
 
+    def get_object_display(self, firewall):
+        return firewall.name_or_id
+
     class Meta(object):
         name = "firewallstable"
         verbose_name = _("Firewalls")

openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ firewall.name|default:_("-") }}</dd>
+    <dd data-display="{{ firewall.name_or_id }}">{{ firewall.name|default:_("-") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ firewall.description|default:_("-") }}</dd>

openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ policy.name|default:_("-") }}</dd>
+    <dd data-display="{{ policy.name_or_id }}">{{ policy.name|default:_("-") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ policy.description|default:_("-") }}</dd>

openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ rule.name|default:_("-") }}</dd>
+    <dd data-display="{{ rule.name_or_id }}">{{ rule.name|default:_("-") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ rule.description|default:_("-") }}</dd>

openstack_dashboard/dashboards/project/images/templates/images/images/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ image.name|default:_("None") }}</dd>
+    <dd data-display="{{ image.name|default:image.id }}">{{ image.name|default:_("None") }}</dd>
     {% if image.properties.description %}
       <dt>{% trans "Description" %}</dt>
       <dd>{{ image.properties.description }}</dd>

openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ instance.name }}</dd>
+    <dd data-display="{{ instance.name|default:instance.id }}">{{ instance.name }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ instance.id }}</dd>
     <dt>{% trans "Status" %}</dt>

openstack_dashboard/dashboards/project/networks/ports/tables.py

@@ -132,7 +132,7 @@ class PortsTable(tables.DataTable):
                               verbose_name=_("MAC Learning State"))
 
     def get_object_display(self, port):
-        return port.id
+        return port.name_or_id
 
     class Meta(object):
         name = "ports"

openstack_dashboard/dashboards/project/networks/subnets/tables.py

@@ -152,6 +152,9 @@ class SubnetsTable(tables.DataTable):
             exceptions.handle(self.request, msg,)
         return network
 
+    def get_object_display(self, subnet):
+        return subnet.name_or_id
+
     class Meta(object):
         name = "subnets"
         verbose_name = _("Subnets")

openstack_dashboard/dashboards/project/networks/tables.py

@@ -189,6 +189,9 @@ class NetworksTable(tables.DataTable):
                                 verbose_name=_("Admin State"),
                                 display_choices=DISPLAY_CHOICES)
 
+    def get_object_display(self, network):
+        return network.name_or_id
+
     class Meta(object):
         name = "networks"
         verbose_name = _("Networks")

openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html

@@ -5,7 +5,7 @@
     <dt title="{% trans 'Name' %}">{% trans "Name" %}</dt>
     <dd>{{ network.name|default:_("None") }}</dd>
     <dt title="{% trans 'ID' %}">{% trans "ID" %}</dt>
-    <dd data-display="{{ network.id|default:_("None") }}">{{ network.id|default:_("None") }}</dd>
+    <dd data-display="{{ network.name_or_id }}">{{ network.id|default:_("None") }}</dd>
     <dt title="{% trans 'Project ID' %}">{% trans "Project ID" %}</dt>
     <dd>{{ network.tenant_id|default:_("-") }}</dd>
     <dt title="{% trans 'Status' %}">{% trans "Status" %}</dt>

openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html

@@ -5,7 +5,7 @@
     <dt>{% trans "Name" %}</dt>
     <dd>{{ port.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
-    <dd data-display="{{ port.id|default:_("None") }}">{{ port.id|default:_("None") }}</dd>
+    <dd data-display="{{ port.name_or_id }}">{{ port.id|default:_("None") }}</dd>
     <dt>{% trans "Network Name" %}</dt>
     <dd>{{ port.network_name|default:_("None") }}</dd>
     <dt>{% trans "Network ID" %}</dt>

openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html

@@ -5,7 +5,7 @@
     <dt title="{% trans 'Name' %}">{% trans "Name" %}</dt>
     <dd>{{ subnet.name|default:_("None") }}</dd>
     <dt title="{% trans 'ID' %}">{% trans "ID" %}</dt>
-    <dd data-display="{{ subnet.id|default:_("None") }}">{{subnet.id|default:_("None") }}</dd>
+    <dd data-display="{{ subnet.name_or_id }}">{{subnet.id|default:_("None") }}</dd>
     <dt title="{% trans 'Network Name' %}">{% trans "Network Name" %}</dt>
     <dd>{{ subnet.network_name|default:_("None") }}</dd>
     <dt title="{% trans 'Network ID' %}">{% trans "Network ID" %}</dt>

openstack_dashboard/dashboards/project/routers/ports/tables.py

@@ -119,7 +119,7 @@ class PortsTable(tables.DataTable):
                                 display_choices=DISPLAY_CHOICES)
 
     def get_object_display(self, port):
-        return port.id
+        return port.name_or_id
 
     class Meta(object):
         name = "interfaces"

openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ router.name|default:_("None") }}</dd>
+    <dd data-display="{{ router.name_or_id }}">{{ router.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ router.id }}</dd>
     <dt>{% trans "Description" %}</dt>

openstack_dashboard/dashboards/project/snapshots/templates/snapshots/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ snapshot.name }}</dd>
+    <dd data-display="{{ snapshot.name|default:snapshot.id }}">{{ snapshot.name }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ snapshot.id }}</dd>
     {% if snapshot.description %}

openstack_dashboard/dashboards/project/stacks/templates/stacks/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ stack.stack_name }}</dd>
+    <dd data-display="{{ stack.stack_name|default:stack.id }}">{{ stack.stack_name }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ stack.id }}</dd>
     <dt>{% trans "Description" %}</dt>

openstack_dashboard/dashboards/project/volumes/templates/volumes/_detail_overview.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ volume.name }}</dd>
+    <dd data-display="{{ volume.name|default:volume.id }}">{{ volume.name }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ volume.id }}</dd>
     {% if volume.description %}

openstack_dashboard/dashboards/project/vpn/tables.py

@@ -332,6 +332,9 @@ class IPSecSiteConnectionsTable(tables.DataTable):
                            status_choices=STATUS_CHOICES,
                            display_choices=STATUS_DISPLAY_CHOICES)
 
+    def get_object_display(self, ipsecsiteconnection):
+        return ipsecsiteconnection.name_or_id
+
     class Meta(object):
         name = "ipsecsiteconnectionstable"
         verbose_name = _("IPSec Site Connections")
@@ -388,6 +391,9 @@ class VPNServicesTable(tables.DataTable):
                            status_choices=STATUS_CHOICES,
                            display_choices=STATUS_DISPLAY_CHOICES)
 
+    def get_object_display(self, vpnservice):
+        return vpnservice.name_or_id
+
     class Meta(object):
         name = "vpnservicestable"
         verbose_name = _("VPN Services")
@@ -422,6 +428,9 @@ class IKEPoliciesTable(tables.DataTable):
         verbose_name=_('Encryption algorithm'))
     pfs = tables.Column("pfs", verbose_name=_('PFS'))
 
+    def get_object_display(self, ikepolicy):
+        return ikepolicy.name_or_id
+
     class Meta(object):
         name = "ikepoliciestable"
         verbose_name = _("IKE Policies")
@@ -443,6 +452,9 @@ class IPSecPoliciesTable(tables.DataTable):
         verbose_name=_('Encryption algorithm'))
     pfs = tables.Column("pfs", verbose_name=_('PFS'))
 
+    def get_object_display(self, ipsecpolicy):
+        return ipsecpolicy.name_or_id
+
     class Meta(object):
         name = "ipsecpoliciestable"
         verbose_name = _("IPSec Policies")

openstack_dashboard/dashboards/project/vpn/templates/vpn/_ikepolicy_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ ikepolicy.name|default:_("None") }}</dd>
+    <dd data-display="{{ ikepolicy.name_or_id }}">{{ ikepolicy.name|default:_("None") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ ikepolicy.description|default:_("None") }}</dd>

openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecpolicy_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ ipsecpolicy.name|default:_("None") }}</dd>
+    <dd data-display="{{ ipsecpolicy.name_or_id }}">{{ ipsecpolicy.name|default:_("None") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ ipsecpolicy.description|default:_("None") }}</dd>

openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ ipsecsiteconnection.name|default:_("None") }}</dd>
+    <dd data-display="{{ ipsecsiteconnection.name_or_id }}">{{ ipsecsiteconnection.name|default:_("None") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ ipsecsiteconnection.description|default:_("None") }}</dd>

openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html

@@ -3,7 +3,7 @@
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ vpnservice.name|default:_("None") }}</dd>
+    <dd data-display="{{ vpnservice.name_or_id }}">{{ vpnservice.name|default:_("None") }}</dd>
 
     <dt>{% trans "Description" %}</dt>
     <dd>{{ vpnservice.description|default:_("None") }}</dd>