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 @@ -{% include 'assets/_asset_bulk_update_modal.html' %} {% endblock %} {% block custom_foot_js %} 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 %} - {% bootstrap_field form.name layout="horizontal" %} - {% bootstrap_field form.asset layout="horizontal" %} + {% bootstrap_field form.assets %} - {% bootstrap_field form.asset_groups layout="horizontal" %} + {% bootstrap_field form.asset_groups %} - {% bootstrap_field form.system_users layout="horizontal" %} + {% bootstrap_field form.system_users %}