From b157551c84ad6c7bec01bd1027d22ff623dacfc6 Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Mon, 31 Jul 2017 13:04:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=B4=D0=B0=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D1=83=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=BE=20=D1=83=D0=B6=D0=B5=20?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D1=8C=20=D0=B2=20=D0=B1=D0=B0=D0=B7=D0=B5,?=
 =?UTF-8?q?=20=D1=82=D0=BE=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?=
 =?UTF-8?q?=D0=B0,=20=D0=B2=D0=B5=D0=B4=D1=83=D1=89=D0=B0=D1=8F=20=D0=BD?=
 =?UTF-8?q?=20=D1=8D=D1=82=D0=BE=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D1=83=D1=8E=D1=89=D0=B5=D0=B5=20=D1=83=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devapp/templates/devapp/dev.html | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html
index e80bab6..43e627d 100644
--- a/devapp/templates/devapp/dev.html
+++ b/devapp/templates/devapp/dev.html
@@ -8,7 +8,7 @@
         </div>
         <div class="panel-body">
 
-            <form role="form" action="{% url 'devapp:edit' dev.user_group.pk|default:0 dev.pk %}" method="post">{% csrf_token %}
+            <form role="form" action="{% url 'devapp:edit' group.pk|default:0 dev.pk %}" method="post">{% csrf_token %}
 
                 <div class="form-group">
                     <label for="id_ip_address">{% trans 'Ip address' %}</label>
@@ -22,11 +22,19 @@
                 <div class="form-group">
                     <label for="id_mac_addr">{% trans 'Mac address' %}</label>
 
-                    <div class="input-group">
+		    <div class="input-group{% if form.mac_addr.errors %} has-error{% endif %}">
                         <span class="input-group-addon"><span class="glyphicon glyphicon-globe"></span></span>
-                        {{ form.mac_addr }}{{ form.mac_addr.errors }}
+                        {{ form.mac_addr }}
+			{% if already_dev %}
+                            <span class="input-group-btn">
+                                <a class="btn btn-danger" href="{% url 'devapp:view' group.pk already_dev.pk %}" title="{% trans 'View the device' %}" data-toggle="tooltip">
+                                    {{ already_dev.comment }}
+                                </a>
+                            </span>
+                        {% endif %}
                     </div>
-                </div>
+		    {{ form.mac_addr.errors }}
+		</div>
 
                 <div class="form-group">
                     <label for="id_comment">{% trans 'Comment' %}</label>
@@ -103,4 +111,4 @@
         </div>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}