[Bugfix] 修改api view name

apps/terminal/serializers.py

@@ -9,17 +9,17 @@ from .hands import ProxyLog
 
 
 class TerminalSerializer(serializers.ModelSerializer):
-    session_connected = serializers.SerializerMethodField()
+    session_online = serializers.SerializerMethodField()
     is_alive = serializers.SerializerMethodField()
 
     class Meta:
         model = Terminal
         fields = ['id', 'name', 'remote_addr', 'http_port', 'ssh_port',
-                  'comment', 'is_accepted', 'session_connected', 'is_alive']
+                  'comment', 'is_accepted', 'session_online', 'is_alive']
 
     @staticmethod
-    def get_session_connected(obj):
+    def get_session_online(obj):
-        return Session.objects.filter(terminal=obj.id, is_finished=False)
+        return Session.objects.filter(terminal=obj.id, is_finished=False).count()
 
     @staticmethod
     def get_is_alive(obj):

apps/terminal/templates/terminal/terminal_list.html

@@ -96,7 +96,7 @@ $(document).ready(function(){
         ],
         ajax_url: '{% url "api-terminal:terminal-list" %}',
         columns: [{data: function(){return ""}}, {data: "name" }, {data: "remote_addr" }, {data: "ssh_port"}, {data: "http_port"},
-                  {data: "session_connected"}, {data: "is_accepted" }, {data: 'is_alive'}, {data: "id"}],
+                  {data: "session_online"}, {data: "is_accepted" }, {data: 'is_alive'}, {data: "id"}],
         op_html: $('#actions').html()
     };
     jumpserver.initDataTable(options);

apps/terminal/templates/terminal/terminal_modal_accept.html

@@ -5,7 +5,7 @@
 {% block modal_title%}{% trans "Accept terminal registration" %}{% endblock %}
 {% block modal_body %}
 {% load bootstrap3 %}
-<form action="{% url 'terminal:terminal-modal-accept' pk="99991937" %}" method="post" class="form-horizontal" id="form_terminal_accept" enctype="multipart/form-data">
+<form action="{% url 'terminal:terminal-accept' pk="99991937" %}" method="post" class="form-horizontal" id="form_terminal_accept" enctype="multipart/form-data">
     {% csrf_token %}
     <p class="alert alert-danger" id="modal-error" style="display: none"></p>
     {% bootstrap_field form.name layout="horizontal" %}

apps/terminal/urls/views_urls.py

@@ -14,8 +14,8 @@ urlpatterns = [
         name='terminal-detail'),
     url(r'^terminal/(?P<pk>[0-9a-zA-Z\-]+)/connect/$', views.TerminalConnectView.as_view(),
         name='terminal-connect'),
-    url(r'^terminal/(?P<pk>[0-9a-zA-Z\-]+)/update$', views.TerminalUpdateView.as_view(),
+    url(r'^terminal/(?P<pk>[0-9a-zA-Z\-]+)/update/$', views.TerminalUpdateView.as_view(),
         name='terminal-update'),
-    url(r'^terminal/(?P<pk>[0-9a-zA-Z\-]+)/modal/accept$', views.TerminalModelAccept.as_view(),
+    url(r'^(?P<pk>[0-9a-zA-Z\-]+)/accept/$', views.TerminalAccept.as_view(),
-        name='terminal-modal-accept'),
+        name='terminal-accept'),
 ]

apps/terminal/views.py

@@ -60,7 +60,7 @@ class TerminalDeleteView(AdminUserRequiredMixin, DeleteView):
     success_url = reverse_lazy('terminal:terminal-list')
 
 
-class TerminalModelAccept(AdminUserRequiredMixin, JSONResponseMixin, UpdateView):
+class TerminalAccept(AdminUserRequiredMixin, JSONResponseMixin, UpdateView):
     model = Terminal
     form_class = TerminalForm
     template_name = 'Terminal/terminal_modal_test.html'