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
6dc2272a
Commit
6dc2272a
authored
Sep 11, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修复无法取消授权资产的前端bug
parent
88a29c0a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
asset_permission_create_update.html
...perms/templates/perms/asset_permission_create_update.html
+6
-3
jms
jms
+1
-1
No files found.
apps/perms/templates/perms/asset_permission_create_update.html
View file @
6dc2272a
...
@@ -86,7 +86,7 @@ $(document).ready(function () {
...
@@ -86,7 +86,7 @@ $(document).ready(function () {
closeOnSelect
:
false
closeOnSelect
:
false
});
});
$
(
'#datepicker'
).
datepicker
({
$
(
'#datepicker'
).
datepicker
({
format
:
"yyyy-mm-dd"
,
format
:
"yyyy-mm-dd
HH:mm
"
,
todayBtn
:
"linked"
,
todayBtn
:
"linked"
,
keyboardNavigation
:
false
,
keyboardNavigation
:
false
,
forceParse
:
false
,
forceParse
:
false
,
...
@@ -94,8 +94,11 @@ $(document).ready(function () {
...
@@ -94,8 +94,11 @@ $(document).ready(function () {
autoclose
:
true
autoclose
:
true
});
});
$
(
"#id_assets"
).
parent
().
find
(
".select2-selection"
).
on
(
'click'
,
function
(
e
)
{
$
(
"#id_assets"
).
parent
().
find
(
".select2-selection"
).
on
(
'click'
,
function
(
e
)
{
e
.
preventDefault
();
if
(
$
(
e
.
target
).
attr
(
'class'
)
!==
'select2-selection__choice__remove'
){
$
(
"#asset_list_modal"
).
modal
();
e
.
preventDefault
();
e
.
stopPropagation
();
$
(
"#asset_list_modal"
).
modal
();
}
})
})
})
})
.
on
(
'click'
,
'#btn_asset_modal_confirm'
,
function
()
{
.
on
(
'click'
,
'#btn_asset_modal_confirm'
,
function
()
{
...
...
jms
View file @
6dc2272a
...
@@ -122,7 +122,7 @@ def start_gunicorn():
...
@@ -122,7 +122,7 @@ def start_gunicorn():
cmd
=
[
cmd
=
[
'gunicorn'
,
'jumpserver.wsgi'
,
'gunicorn'
,
'jumpserver.wsgi'
,
'-b'
,
bind
,
'-b'
,
bind
,
'-k'
,
'eventlet'
,
#
'-k', 'eventlet',
'-w'
,
str
(
WORKERS
),
'-w'
,
str
(
WORKERS
),
'--access-logformat'
,
log_format
,
'--access-logformat'
,
log_format
,
'-p'
,
pid_file
,
'-p'
,
pid_file
,
...
...
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