From 606255e1ab39603aa91145c2ade30e895cb4852f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 9 May 2016 12:16:21 -0400 Subject: [PATCH] Updated templates to reflect new CBVs --- netbox/templates/dcim/device_delete.html | 4 ++-- netbox/templates/dcim/device_edit.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/netbox/templates/dcim/device_delete.html b/netbox/templates/dcim/device_delete.html index 5d1b0a394..587dad0b7 100644 --- a/netbox/templates/dcim/device_delete.html +++ b/netbox/templates/dcim/device_delete.html @@ -1,8 +1,8 @@ {% extends 'utilities/confirmation_form.html' %} {% load form_helpers %} -{% block title %}Delete device {{ device }}?{% endblock %} +{% block title %}Delete device {{ obj }}?{% endblock %} {% block message %} -

Are you sure you want to delete {{ device }}?

+

Are you sure you want to delete {{ obj }}?

{% endblock %} diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index 86ab2be81..dfc1ad5d2 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -1,11 +1,11 @@ {% extends '_base.html' %} {% load form_helpers %} -{% block title %}{% if device %}Editing device {{ device }}{% else %}Add a device{% endif %}{% endblock %} +{% block title %}{% if obj %}Editing device {{ obj }}{% else %}Add a device{% endif %}{% endblock %} {% block content %} -{% if device %} -

{{ device }}

+{% if obj %} +

{{ obj }}

{% else %}

Add a Device

{% endif %} @@ -62,7 +62,7 @@
{% render_field form.platform %} {% render_field form.status %} - {% if device %}{% render_field form.primary_ip %}{% endif %} + {% if obj %}{% render_field form.primary_ip %}{% endif %} {% render_field form.ro_snmp %}
@@ -70,9 +70,9 @@
- {% if device %} + {% if obj %} - Cancel + Cancel {% else %}