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 @@
-
+
{{ idc.name }} @@ -51,10 +51,10 @@
- +
- - + + 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 %}
{% trans 'Name' %}:
{% trans 'Name' %}: {{ idc.name }}
- {% bootstrap_field form.name layout="horizontal" %} + {% bootstrap_field form.name %}
- {% bootstrap_field form.assets 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 %}