Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
41633be1
Commit
41633be1
authored
May 22, 2017
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修复无法删除资产组
parent
d2620a65
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
idc_detail.html
apps/assets/templates/assets/idc_detail.html
+4
-4
group.py
apps/users/models/group.py
+0
-1
user_group_asset_permission.html
apps/users/templates/users/user_group_asset_permission.html
+4
-4
No files found.
apps/assets/templates/assets/idc_detail.html
View file @
41633be1
...
...
@@ -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>
...
...
apps/users/models/group.py
View file @
41633be1
...
...
@@ -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
()
...
...
apps/users/templates/users/user_group_asset_permission.html
View file @
41633be1
...
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment