From 41633be1aaf1029d195805c5e5d6a43c31574fa2 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 22 May 2017 20:30:31 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B5=84=E4=BA=A7=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/idc_detail.html              | 8 ++++----
 apps/users/models/group.py                                | 1 -
 .../templates/users/user_group_asset_permission.html      | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/assets/templates/assets/idc_detail.html b/apps/assets/templates/assets/idc_detail.html
index 58082a4e0..3b7f777b7 100644
--- a/apps/assets/templates/assets/idc_detail.html
+++ b/apps/assets/templates/assets/idc_detail.html
@@ -32,7 +32,7 @@
                         </ul>
                     </div>
                     <div class="tab-content">
-                        <div class="col-sm-9" style="padding-left: 0;">
+                        <div class="col-sm-7" style="padding-left: 0;">
                             <div class="ibox float-e-margins">
                                 <div class="ibox-title">
                                     <span class="label"><b>{{ idc.name }}</b></span>
@@ -51,10 +51,10 @@
                                     </div>
                                 </div>
                                 <div class="ibox-content">
-                                    <table class="table idc-details">
+                                    <table class="table">
                                         <tbody>
-                                        <tr class="no-borders-tr" data-name="{{ idc.name }}">
-                                            <td>{% trans 'Name' %}:</td>
+                                        <tr class="no-borders-tr">
+                                            <td width="20%">{% trans 'Name' %}:</td>
                                             <td><b>{{ idc.name }}</b></td>
                                         </tr>
                                         <tr>
diff --git a/apps/users/models/group.py b/apps/users/models/group.py
index 0c869de42..f6a201d51 100644
--- a/apps/users/models/group.py
+++ b/apps/users/models/group.py
@@ -26,7 +26,6 @@ class UserGroup(NoDeleteModelMixin):
     __str__ = __unicode__
 
     def delete(self, using=None, keep_parents=False):
-        self.group_ptr.delete()
         if self.name != 'Default':
             self.users.clear()
             return super(UserGroup, self).delete()
diff --git a/apps/users/templates/users/user_group_asset_permission.html b/apps/users/templates/users/user_group_asset_permission.html
index 1108eb4c1..cd6db7f46 100644
--- a/apps/users/templates/users/user_group_asset_permission.html
+++ b/apps/users/templates/users/user_group_asset_permission.html
@@ -77,22 +77,22 @@
                                                 {% csrf_token %}
                                                 <tr class="no-borders-tr">
                                                     <td colspan="1" style="padding-top: 0">
-                                                        {% bootstrap_field form.name layout="horizontal" %}
+                                                        {% bootstrap_field form.name %}
                                                     </td>
                                                 </tr>
                                                 <tr class="no-borders-tr">
                                                     <td colspan="1" style="padding-top: 0">
-                                                        {% bootstrap_field form.assets layout="horizontal" %}
+                                                        {% bootstrap_field form.assets %}
                                                     </td>
                                                 </tr>
                                                 <tr class="no-borders-tr">
                                                     <td colspan="1" style="padding-top: 0">
-                                                        {% bootstrap_field form.asset_groups layout="horizontal" %}
+                                                        {% bootstrap_field form.asset_groups %}
                                                     </td>
                                                 </tr>
                                                 <tr class="no-borders-tr">
                                                     <td colspan="1" style="padding-top: 0">
-                                                        {% bootstrap_field form.system_users layout="horizontal" %}
+                                                        {% bootstrap_field form.system_users %}
                                                     </td>
                                                 </tr>
                                                 <tr class="no-borders-tr">