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
f9e9bf0b
Commit
f9e9bf0b
authored
Nov 05, 2018
by
BaiJiangJie
Committed by
老广
Nov 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 更新用户/授权规则过期时间精确到min (#1993)
parent
1e5387ef
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
426 additions
and
21 deletions
+426
-21
asset_permission_create_update.html
...perms/templates/perms/asset_permission_create_update.html
+21
-11
daterangepicker.css
apps/static/css/plugins/daterangepicker/daterangepicker.css
+389
-0
daterangepicker.min.js
.../static/js/plugins/daterangepicker/daterangepicker.min.js
+0
-0
moment.min.js
apps/static/js/plugins/daterangepicker/moment.min.js
+0
-0
_user.html
apps/users/templates/users/_user.html
+16
-10
No files found.
apps/perms/templates/perms/asset_permission_create_update.html
View file @
f9e9bf0b
...
@@ -54,9 +54,9 @@
...
@@ -54,9 +54,9 @@
<div
class=
"col-sm-9"
>
<div
class=
"col-sm-9"
>
<div
class=
"input-daterange input-group"
id=
"datepicker"
>
<div
class=
"input-daterange input-group"
id=
"datepicker"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
<input
type=
"text"
class=
"input-sm form-control"
name=
"date_start"
value=
"{{ form.date_start.value|date:'Y-m-d
' }}"
>
<input
type=
"text"
class=
"input-sm form-control"
id=
"date_start"
name=
"date_start"
value=
"{{ form.date_start.value|date:'Y-m-d H:i
' }}"
>
<span
class=
"input-group-addon"
>
to
</span>
<span
class=
"input-group-addon"
>
to
</span>
<input
type=
"text"
class=
"input-sm form-control"
name=
"date_expired"
value=
"{{ form.date_expired.value|date:'Y-m-d
' }}"
>
<input
type=
"text"
class=
"input-sm form-control"
id=
"date_expired"
name=
"date_expired"
value=
"{{ form.date_expired.value|date:'Y-m-d H:i
' }}"
>
</div>
</div>
<span
class=
"help-block "
>
{{ form.date_expired.errors }}
</span>
<span
class=
"help-block "
>
{{ form.date_expired.errors }}
</span>
<span
class=
"help-block "
>
{{ form.date_start.errors }}
</span>
<span
class=
"help-block "
>
{{ form.date_start.errors }}
</span>
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
<button
id=
"submit_button"
class=
"btn btn-primary"
type=
"submit"
>
{% trans 'Submit' %}
</button>
<button
id=
"submit_button"
class=
"btn btn-primary"
type=
"submit"
>
{% trans 'Submit' %}
</button>
</div>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
</div>
</div>
...
@@ -80,19 +81,27 @@
...
@@ -80,19 +81,27 @@
{% endblock %}
{% endblock %}
{% block custom_foot_js %}
{% block custom_foot_js %}
<script
src=
"{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"
></script>
<script
src=
"{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"
></script>
<script
type=
"text/javascript"
src=
'{% static "js/plugins/daterangepicker/moment.min.js" %}'
></script>
<script
type=
"text/javascript"
src=
'{% static "js/plugins/daterangepicker/daterangepicker.min.js" %}'
></script>
<link
rel=
"stylesheet"
type=
"text/css"
href=
{%
static
"
css
/
plugins
/
daterangepicker
/
daterangepicker
.
css
"
%}
/>
<script>
<script>
var
dateOptions
=
{
singleDatePicker
:
true
,
showDropdowns
:
true
,
timePicker
:
true
,
timePicker24Hour
:
true
,
autoApply
:
true
,
locale
:
{
format
:
'YYYY-MM-DD HH:mm'
}
};
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
$
(
'.select2'
).
select2
({
$
(
'.select2'
).
select2
({
closeOnSelect
:
false
closeOnSelect
:
false
});
});
$
(
'#datepicker'
).
datepicker
({
$
(
'#date_start'
).
daterangepicker
(
dateOptions
);
format
:
"yyyy-mm-dd"
,
$
(
'#date_expired'
).
daterangepicker
(
dateOptions
);
todayBtn
:
"linked"
,
keyboardNavigation
:
false
,
forceParse
:
false
,
calendarWeeks
:
true
,
autoclose
:
true
});
$
(
"#id_assets"
).
parent
().
find
(
".select2-selection"
).
on
(
'click'
,
function
(
e
)
{
$
(
"#id_assets"
).
parent
().
find
(
".select2-selection"
).
on
(
'click'
,
function
(
e
)
{
if
(
$
(
e
.
target
).
attr
(
'class'
)
!==
'select2-selection__choice__remove'
){
if
(
$
(
e
.
target
).
attr
(
'class'
)
!==
'select2-selection__choice__remove'
){
e
.
preventDefault
();
e
.
preventDefault
();
...
@@ -110,6 +119,6 @@ $(document).ready(function () {
...
@@ -110,6 +119,6 @@ $(document).ready(function () {
$
(
'.select2'
).
val
(
assets
).
trigger
(
'change'
);
$
(
'.select2'
).
val
(
assets
).
trigger
(
'change'
);
});
});
$
(
"#asset_list_modal"
).
modal
(
'hide'
);
$
(
"#asset_list_modal"
).
modal
(
'hide'
);
})
})
;
</script>
</script>
{% endblock %}
{% endblock %}
\ No newline at end of file
apps/static/css/plugins/daterangepicker/daterangepicker.css
0 → 100644
View file @
f9e9bf0b
.daterangepicker
{
position
:
absolute
;
color
:
inherit
;
background-color
:
#fff
;
border-radius
:
4px
;
border
:
1px
solid
#ddd
;
width
:
278px
;
max-width
:
none
;
padding
:
0
;
margin-top
:
7px
;
top
:
100px
;
left
:
20px
;
z-index
:
3001
;
display
:
none
;
font-family
:
arial
;
font-size
:
15px
;
line-height
:
1em
;
}
.daterangepicker
:before
,
.daterangepicker
:after
{
position
:
absolute
;
display
:
inline-block
;
border-bottom-color
:
rgba
(
0
,
0
,
0
,
0.2
);
content
:
''
;
}
.daterangepicker
:before
{
top
:
-7px
;
border-right
:
7px
solid
transparent
;
border-left
:
7px
solid
transparent
;
border-bottom
:
7px
solid
#ccc
;
}
.daterangepicker
:after
{
top
:
-6px
;
border-right
:
6px
solid
transparent
;
border-bottom
:
6px
solid
#fff
;
border-left
:
6px
solid
transparent
;
}
.daterangepicker.opensleft
:before
{
right
:
9px
;
}
.daterangepicker.opensleft
:after
{
right
:
10px
;
}
.daterangepicker.openscenter
:before
{
left
:
0
;
right
:
0
;
width
:
0
;
margin-left
:
auto
;
margin-right
:
auto
;
}
.daterangepicker.openscenter
:after
{
left
:
0
;
right
:
0
;
width
:
0
;
margin-left
:
auto
;
margin-right
:
auto
;
}
.daterangepicker.opensright
:before
{
left
:
9px
;
}
.daterangepicker.opensright
:after
{
left
:
10px
;
}
.daterangepicker.drop-up
{
margin-top
:
-7px
;
}
.daterangepicker.drop-up
:before
{
top
:
initial
;
bottom
:
-7px
;
border-bottom
:
initial
;
border-top
:
7px
solid
#ccc
;
}
.daterangepicker.drop-up
:after
{
top
:
initial
;
bottom
:
-6px
;
border-bottom
:
initial
;
border-top
:
6px
solid
#fff
;
}
.daterangepicker.single
.daterangepicker
.ranges
,
.daterangepicker.single
.drp-calendar
{
float
:
none
;
}
.daterangepicker.single
.drp-selected
{
display
:
none
;
}
.daterangepicker.show-calendar
.drp-calendar
{
display
:
block
;
}
.daterangepicker.show-calendar
.drp-buttons
{
display
:
block
;
}
.daterangepicker.auto-apply
.drp-buttons
{
display
:
none
;
}
.daterangepicker
.drp-calendar
{
display
:
none
;
max-width
:
270px
;
}
.daterangepicker
.drp-calendar.left
{
padding
:
8px
0
8px
8px
;
}
.daterangepicker
.drp-calendar.right
{
padding
:
8px
;
}
.daterangepicker
.drp-calendar.single
.calendar-table
{
border
:
none
;
}
.daterangepicker
.calendar-table
.next
span
,
.daterangepicker
.calendar-table
.prev
span
{
color
:
#fff
;
border
:
solid
black
;
border-width
:
0
2px
2px
0
;
border-radius
:
0
;
display
:
inline-block
;
padding
:
3px
;
}
.daterangepicker
.calendar-table
.next
span
{
transform
:
rotate
(
-45deg
);
-webkit-transform
:
rotate
(
-45deg
);
}
.daterangepicker
.calendar-table
.prev
span
{
transform
:
rotate
(
135deg
);
-webkit-transform
:
rotate
(
135deg
);
}
.daterangepicker
.calendar-table
th
,
.daterangepicker
.calendar-table
td
{
white-space
:
nowrap
;
text-align
:
center
;
vertical-align
:
middle
;
min-width
:
32px
;
width
:
32px
;
height
:
24px
;
line-height
:
24px
;
font-size
:
12px
;
border-radius
:
4px
;
border
:
1px
solid
transparent
;
white-space
:
nowrap
;
cursor
:
pointer
;
}
.daterangepicker
.calendar-table
{
border
:
1px
solid
#fff
;
border-radius
:
4px
;
background-color
:
#fff
;
}
.daterangepicker
.calendar-table
table
{
width
:
100%
;
margin
:
0
;
border-spacing
:
0
;
border-collapse
:
collapse
;
}
.daterangepicker
td
.available
:hover
,
.daterangepicker
th
.available
:hover
{
background-color
:
#eee
;
border-color
:
transparent
;
color
:
inherit
;
}
.daterangepicker
td
.week
,
.daterangepicker
th
.week
{
font-size
:
80%
;
color
:
#ccc
;
}
.daterangepicker
td
.off
,
.daterangepicker
td
.off.in-range
,
.daterangepicker
td
.off.start-date
,
.daterangepicker
td
.off.end-date
{
background-color
:
#fff
;
border-color
:
transparent
;
color
:
#999
;
}
.daterangepicker
td
.in-range
{
background-color
:
#ebf4f8
;
border-color
:
transparent
;
color
:
#000
;
border-radius
:
0
;
}
.daterangepicker
td
.start-date
{
border-radius
:
4px
0
0
4px
;
}
.daterangepicker
td
.end-date
{
border-radius
:
0
4px
4px
0
;
}
.daterangepicker
td
.start-date.end-date
{
border-radius
:
4px
;
}
.daterangepicker
td
.active
,
.daterangepicker
td
.active
:hover
{
background-color
:
#357ebd
;
border-color
:
transparent
;
color
:
#fff
;
}
.daterangepicker
th
.month
{
width
:
auto
;
}
.daterangepicker
td
.disabled
,
.daterangepicker
option
.disabled
{
color
:
#999
;
cursor
:
not-allowed
;
text-decoration
:
line-through
;
}
.daterangepicker
select
.monthselect
,
.daterangepicker
select
.yearselect
{
font-size
:
12px
;
padding
:
1px
;
height
:
auto
;
margin
:
0
;
cursor
:
default
;
}
.daterangepicker
select
.monthselect
{
margin-right
:
2%
;
width
:
56%
;
}
.daterangepicker
select
.yearselect
{
width
:
40%
;
}
.daterangepicker
select
.hourselect
,
.daterangepicker
select
.minuteselect
,
.daterangepicker
select
.secondselect
,
.daterangepicker
select
.ampmselect
{
width
:
50px
;
margin
:
0
auto
;
background
:
#eee
;
border
:
1px
solid
#eee
;
padding
:
2px
;
outline
:
0
;
font-size
:
12px
;
}
.daterangepicker
.calendar-time
{
text-align
:
center
;
margin
:
4px
auto
0
auto
;
line-height
:
30px
;
position
:
relative
;
}
.daterangepicker
.calendar-time
select
.disabled
{
color
:
#ccc
;
cursor
:
not-allowed
;
}
.daterangepicker
.drp-buttons
{
clear
:
both
;
text-align
:
right
;
padding
:
8px
;
border-top
:
1px
solid
#ddd
;
display
:
none
;
line-height
:
12px
;
vertical-align
:
middle
;
}
.daterangepicker
.drp-selected
{
display
:
inline-block
;
font-size
:
12px
;
padding-right
:
8px
;
}
.daterangepicker
.drp-buttons
.btn
{
margin-left
:
8px
;
font-size
:
12px
;
font-weight
:
bold
;
padding
:
4px
8px
;
}
.daterangepicker.show-ranges
.drp-calendar.left
{
border-left
:
1px
solid
#ddd
;
}
.daterangepicker
.ranges
{
float
:
none
;
text-align
:
left
;
margin
:
0
;
}
.daterangepicker.show-calendar
.ranges
{
margin-top
:
8px
;
}
.daterangepicker
.ranges
ul
{
list-style
:
none
;
margin
:
0
auto
;
padding
:
0
;
width
:
100%
;
}
.daterangepicker
.ranges
li
{
font-size
:
12px
;
padding
:
8px
12px
;
cursor
:
pointer
;
}
.daterangepicker
.ranges
li
:hover
{
background-color
:
#eee
;
}
.daterangepicker
.ranges
li
.active
{
background-color
:
#08c
;
color
:
#fff
;
}
/* Larger Screen Styling */
@media
(
min-width
:
564px
)
{
.daterangepicker
{
width
:
auto
;
}
.daterangepicker
.ranges
ul
{
width
:
140px
;
}
.daterangepicker.single
.ranges
ul
{
width
:
100%
;
}
.daterangepicker.single
.drp-calendar.left
{
clear
:
none
;
}
.daterangepicker.single.ltr
.ranges
,
.daterangepicker.single.ltr
.drp-calendar
{
float
:
left
;
}
.daterangepicker.single.rtl
.ranges
,
.daterangepicker.single.rtl
.drp-calendar
{
float
:
right
;
}
.daterangepicker.ltr
{
direction
:
ltr
;
text-align
:
left
;
}
.daterangepicker.ltr
.drp-calendar.left
{
clear
:
left
;
margin-right
:
0
;
}
.daterangepicker.ltr
.drp-calendar.left
.calendar-table
{
border-right
:
none
;
border-top-right-radius
:
0
;
border-bottom-right-radius
:
0
;
}
.daterangepicker.ltr
.drp-calendar.right
{
margin-left
:
0
;
}
.daterangepicker.ltr
.drp-calendar.right
.calendar-table
{
border-left
:
none
;
border-top-left-radius
:
0
;
border-bottom-left-radius
:
0
;
}
.daterangepicker.ltr
.drp-calendar.left
.calendar-table
{
padding-right
:
8px
;
}
.daterangepicker.ltr
.ranges
,
.daterangepicker.ltr
.drp-calendar
{
float
:
left
;
}
.daterangepicker.rtl
{
direction
:
rtl
;
text-align
:
right
;
}
.daterangepicker.rtl
.drp-calendar.left
{
clear
:
right
;
margin-left
:
0
;
}
.daterangepicker.rtl
.drp-calendar.left
.calendar-table
{
border-left
:
none
;
border-top-left-radius
:
0
;
border-bottom-left-radius
:
0
;
}
.daterangepicker.rtl
.drp-calendar.right
{
margin-right
:
0
;
}
.daterangepicker.rtl
.drp-calendar.right
.calendar-table
{
border-right
:
none
;
border-top-right-radius
:
0
;
border-bottom-right-radius
:
0
;
}
.daterangepicker.rtl
.drp-calendar.left
.calendar-table
{
padding-left
:
12px
;
}
.daterangepicker.rtl
.ranges
,
.daterangepicker.rtl
.drp-calendar
{
text-align
:
right
;
float
:
right
;
}
}
@media
(
min-width
:
730px
)
{
.daterangepicker
.ranges
{
width
:
auto
;
}
.daterangepicker.ltr
.ranges
{
float
:
left
;
}
.daterangepicker.rtl
.ranges
{
float
:
right
;
}
.daterangepicker
.drp-calendar.left
{
clear
:
none
!important
;
}
}
\ No newline at end of file
apps/static/js/plugins/daterangepicker/daterangepicker.min.js
0 → 100644
View file @
f9e9bf0b
This diff is collapsed.
Click to expand it.
apps/static/js/plugins/daterangepicker/moment.min.js
0 → 100644
View file @
f9e9bf0b
This diff is collapsed.
Click to expand it.
apps/users/templates/users/_user.html
View file @
f9e9bf0b
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<div
class=
"col-sm-9"
>
<div
class=
"col-sm-9"
>
<div
class=
"input-group date"
>
<div
class=
"input-group date"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
<input
id=
"{{ form.date_expired.id_for_label }}"
name=
"{{ form.date_expired.html_name }}"
type=
"text"
class=
"form-control"
value=
"{{ form.date_expired.value|date:'Y-m-d' }}"
>
<input
id=
"{{ form.date_expired.id_for_label }}"
name=
"{{ form.date_expired.html_name }}"
type=
"text"
class=
"form-control"
value=
"{{ form.date_expired.value|date:'Y-m-d
H:i
' }}"
>
</div>
</div>
<span
class=
"help-block "
>
{{ form.date_expired.errors }}
</span>
<span
class=
"help-block "
>
{{ form.date_expired.errors }}
</span>
</div>
</div>
...
@@ -52,18 +52,24 @@
...
@@ -52,18 +52,24 @@
{% endblock %}
{% endblock %}
{% block custom_foot_js %}
{% block custom_foot_js %}
<script
src=
"{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"
></script>
<script
src=
"{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"
></script>
<script
type=
"text/javascript"
src=
'{% static "js/plugins/daterangepicker/moment.min.js" %}'
></script>
<script
type=
"text/javascript"
src=
'{% static "js/plugins/daterangepicker/daterangepicker.min.js" %}'
></script>
<link
rel=
"stylesheet"
type=
"text/css"
href=
{%
static
"
css
/
plugins
/
daterangepicker
/
daterangepicker
.
css
"
%}
/>
<script>
<script>
var
dateOptions
=
{
singleDatePicker
:
true
,
showDropdowns
:
true
,
timePicker
:
true
,
timePicker24Hour
:
true
,
autoApply
:
true
,
locale
:
{
format
:
'YYYY-MM-DD HH:mm'
}
};
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
$
(
'.select2'
).
select2
();
$
(
'.select2'
).
select2
();
$
(
'#id_date_expired'
).
daterangepicker
(
dateOptions
);
$
(
'.input-group.date'
).
datepicker
({
format
:
"yyyy-mm-dd"
,
todayBtn
:
"linked"
,
keyboardNavigation
:
false
,
forceParse
:
false
,
calendarWeeks
:
true
,
autoclose
:
true
});
})
})
</script>
</script>
{% endblock %}
{% endblock %}
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