github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 修复无法删除资产组

pull/446/head
ibuler 2017-05-22 20:30:31 +08:00
parent d2620a655c
commit 41633be1aa
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/assets/templates/assets/idc_detail.html
View File

@ -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>

1
apps/users/models/group.py
View File

@ -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()

8
apps/users/templates/users/user_group_asset_permission.html
View File

@ -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">