github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-02 07:55:16 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 修改session支持protocol搜索

Browse Source
This commit is contained in:
ibuler
2019-10-16 15:29:44 +08:00
parent 237d51cff9
commit c3699889e2
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/static/js/jumpserver.js
View File

@@ -579,6 +579,9 @@ jumpserver.initServerSideDataTable = function (options) {
ajax: { ajax: {
url: options.ajax_url, url: options.ajax_url,
error: function (jqXHR, textStatus, errorThrown) { error: function (jqXHR, textStatus, errorThrown) {
if (jqXHR.responseText && jqXHR.responseText.indexOf("%(value)s") ) {
return
}
var msg = gettext("Unknown error occur"); var msg = gettext("Unknown error occur");
if (jqXHR.responseJSON) { if (jqXHR.responseJSON) {
if (jqXHR.responseJSON.error) { if (jqXHR.responseJSON.error) {

2
apps/terminal/api/session.py
View File

@@ -27,7 +27,7 @@ class SessionViewSet(OrgBulkModelViewSet):
queryset = Session.objects.all() queryset = Session.objects.all()
serializer_class = serializers.SessionSerializer serializer_class = serializers.SessionSerializer
permission_classes = (IsOrgAdminOrAppUser, ) permission_classes = (IsOrgAdminOrAppUser, )
filter_fields = [ filterset_fields = [
"user", "asset", "system_user", "remote_addr", "user", "asset", "system_user", "remote_addr",
"protocol", "terminal", "is_finished", "protocol", "terminal", "is_finished",
] ]

1
apps/terminal/templates/terminal/session_list.html
View File

@@ -72,6 +72,7 @@
<li><a class="search-item" data-value="asset">{% trans 'Asset' %}</a></li> <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="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="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>#} {# <li><a class="search-item" data-value="protocol">{% trans 'Protocol' %}</a></li>#}
</ul> </ul>
{% endblock %} {% endblock %}