From d2620a655ce262d69f4ba8e1255b16720e3eacaa Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 22 May 2017 20:18:13 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?bug,=20=E4=BF=AE=E5=A4=8Dgetattr=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/idc_assets.html          | 1 -
 apps/perms/models.py                                  | 4 ++--
 apps/users/templates/users/user_asset_permission.html | 7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/assets/templates/assets/idc_assets.html b/apps/assets/templates/assets/idc_assets.html
index f28e07570..0ff83ff67 100644
--- a/apps/assets/templates/assets/idc_assets.html
+++ b/apps/assets/templates/assets/idc_assets.html
@@ -112,7 +112,6 @@
             </div>
         </div>
     </div>
-{% include 'assets/_asset_bulk_update_modal.html' %}
 {% endblock %}
 {% block custom_foot_js %}
 <script src="{% static 'js/jquery.form.min.js' %}"></script>
diff --git a/apps/perms/models.py b/apps/perms/models.py
index 1cdd39558..f5cf654d2 100644
--- a/apps/perms/models.py
+++ b/apps/perms/models.py
@@ -57,7 +57,7 @@ class AssetPermission(models.Model):
             for user in user_group.users.all():
                 setattr(user, 'is_inherit_from_user_groups', True)
                 setattr(user, 'inherit_from_user_groups',
-                        getattr(user, b'inherit_from_user_groups', set()).add(user_group))
+                        getattr(user, 'inherit_from_user_groups', set()).add(user_group))
                 users.add(user)
         return users
 
@@ -70,7 +70,7 @@ class AssetPermission(models.Model):
             for asset in asset_group.assets.all():
                 setattr(asset, 'is_inherit_from_asset_groups', True)
                 setattr(asset, 'inherit_from_asset_groups',
-                        getattr(asset, b'inherit_from_user_groups', set()).add(asset_group))
+                        getattr(asset, 'inherit_from_user_groups', set()).add(asset_group))
                 assets.add(asset)
         return assets
 
diff --git a/apps/users/templates/users/user_asset_permission.html b/apps/users/templates/users/user_asset_permission.html
index 73c6e824b..609c4a69f 100644
--- a/apps/users/templates/users/user_asset_permission.html
+++ b/apps/users/templates/users/user_asset_permission.html
@@ -77,22 +77,21 @@
                                                 {% csrf_token %}
                                                 <tr class="no-borders-tr">
                                                     <td colspan="1" style="padding-top: 0">
-                                                        {% bootstrap_field form.name layout="horizontal" %}
                                                     </td>
                                                 </tr>
                                                 <tr class="no-borders-tr">
                                                     <td colspan="1" style="padding-top: 0">
-                                                        {% bootstrap_field form.asset 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">