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
2829a7ad
Commit
2829a7ad
authored
Dec 04, 2015
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix asset admin count
parent
b5325fd0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
13 deletions
+20
-13
perm_api.py
jperm/perm_api.py
+0
-2
asset_add.html
templates/jasset/asset_add.html
+20
-11
No files found.
jperm/perm_api.py
View file @
2829a7ad
...
...
@@ -296,11 +296,9 @@ def get_role_push_host(role):
asset_all
=
Asset
.
objects
.
all
()
asset_pushed
=
{}
for
push
in
pushs
:
print
push
.
result
asset_pushed
[
push
.
asset
]
=
{
'success'
:
push
.
success
,
'key'
:
push
.
is_public_key
,
'password'
:
push
.
is_password
,
'result'
:
push
.
result
}
asset_no_push
=
set
(
asset_all
)
-
set
(
asset_pushed
.
keys
())
print
asset_no_push
,
asset_pushed
return
asset_pushed
,
asset_no_push
...
...
templates/jasset/asset_add.html
View file @
2829a7ad
...
...
@@ -76,9 +76,9 @@
<div
class=
"form-group"
id=
"id_port"
>
<div
class=
"hr-line-dashed"
></div>
<label
class=
"col-sm-2 control-label"
>
端口
<span
class=
"red-fonts"
>
*
</span>
</label>
<div
class=
"col-sm-8"
>
<input
type=
"text"
placeholder=
"Port"
name=
"port"
class=
"form-control"
value=
"{{ default_port }}"
>
</div>
<div
class=
"col-sm-8"
>
<input
type=
"text"
placeholder=
"Port"
name=
"port"
class=
"form-control"
value=
"{{ default_port }}"
>
</div>
</div>
<div
class=
"hr-line-dashed"
></div>
...
...
@@ -118,14 +118,23 @@
{% block self_footer_js %}
<script>
$
(
'document'
).
ready
(
function
(){
$
(
'#id_use_default_auth'
).
click
(
function
(){
if
(
$
(
this
).
is
(
':checked'
)){
$
(
'#admin_account'
).
css
(
'display'
,
'none'
);
}
else
{
$
(
'#admin_account'
).
css
(
'display'
,
'block'
);
}
})
var
check_default
=
"{{ default_setting.name }}"
;
console
.
log
(
check_default
);
if
(
check_default
!=
'default'
){
$
(
'#id_use_default_auth'
).
attr
(
'disabled'
,
true
);
$
(
'#id_use_default_auth'
).
attr
(
'checked'
,
false
);
$
(
'#admin_account'
).
css
(
'display'
,
'block'
);
}
else
{
$
(
'#id_use_default_auth'
).
click
(
function
(){
if
(
$
(
this
).
is
(
':checked'
)){
$
(
'#admin_account'
).
css
(
'display'
,
'none'
);
}
else
{
$
(
'#admin_account'
).
css
(
'display'
,
'block'
);
}
})
}
});
var
required_fields
=
[
"id_hostname"
,
"id_port"
];
...
...
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