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
c3699889
Commit
c3699889
authored
Oct 16, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改session支持protocol搜索
parent
237d51cf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
jumpserver.js
apps/static/js/jumpserver.js
+3
-0
session.py
apps/terminal/api/session.py
+1
-1
session_list.html
apps/terminal/templates/terminal/session_list.html
+1
-0
No files found.
apps/static/js/jumpserver.js
View file @
c3699889
...
...
@@ -579,6 +579,9 @@ jumpserver.initServerSideDataTable = function (options) {
ajax
:
{
url
:
options
.
ajax_url
,
error
:
function
(
jqXHR
,
textStatus
,
errorThrown
)
{
if
(
jqXHR
.
responseText
&&
jqXHR
.
responseText
.
indexOf
(
"%(value)s"
)
)
{
return
}
var
msg
=
gettext
(
"Unknown error occur"
);
if
(
jqXHR
.
responseJSON
)
{
if
(
jqXHR
.
responseJSON
.
error
)
{
...
...
apps/terminal/api/session.py
View file @
c3699889
...
...
@@ -27,7 +27,7 @@ class SessionViewSet(OrgBulkModelViewSet):
queryset
=
Session
.
objects
.
all
()
serializer_class
=
serializers
.
SessionSerializer
permission_classes
=
(
IsOrgAdminOrAppUser
,
)
filter_fields
=
[
filter
set
_fields
=
[
"user"
,
"asset"
,
"system_user"
,
"remote_addr"
,
"protocol"
,
"terminal"
,
"is_finished"
,
]
...
...
apps/terminal/templates/terminal/session_list.html
View file @
c3699889
...
...
@@ -72,6 +72,7 @@
<li><a
class=
"search-item"
data-value=
"asset"
>
{% trans 'Asset' %}
</a></li>
<li><a
class=
"search-item"
data-value=
"system_user"
>
{% trans 'System user' %}
</a></li>
<li><a
class=
"search-item"
data-value=
"remote_addr"
>
{% trans 'Remote addr' %}
</a></li>
<li><a
class=
"search-item"
data-value=
"protocol"
>
{% trans 'Protocol' %}
</a></li>
{#
<li><a
class=
"search-item"
data-value=
"protocol"
>
{% trans 'Protocol' %}
</a></li>
#}
</ul>
{% 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