[Update] api 返回platform, 并增加web terminal nav

apps/assets/serializers.py

@@ -191,9 +191,11 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
 
     class Meta(object):
         model = Asset
-        fields = ("id", "hostname", "ip", "port", "system_users_granted",
-                  "is_inherited", "is_active", "system_users_join", "os",
-                  "platform", "comment",)
+        fields = (
+            "id", "hostname", "ip", "port", "system_users_granted",
+            "is_inherited", "is_active", "system_users_join", "os",
+            "platform", "comment"
+        )
 
     @staticmethod
     def get_is_inherited(obj):
@@ -214,8 +216,11 @@ class MyAssetGrantedSerializer(AssetGrantedSerializer):
 
     class Meta(object):
         model = Asset
-        fields = ("id", "hostname", "system_users_granted", "is_inherited",
-                  "is_active", "system_users_join", "comment")
+        fields = (
+            "id", "hostname", "system_users_granted",
+            "is_inherited", "is_active", "system_users_join",
+            "os", "platform", "comment",
+        )
 
 
 class ClusterSerializer(BulkSerializerMixin, serializers.ModelSerializer):

apps/assets/templates/assets/user_asset_list.html

@@ -24,7 +24,6 @@
             <th class="text-center">{% trans 'Hardware' %}</th>
             <th class="text-center">{% trans 'Active' %}</th>
             <th class="text-center">{% trans 'Connective' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
         </tr>
     </thead>
     <tbody>
@@ -61,16 +60,16 @@ function initTable() {
                     $(td).html('<i class="fa fa-circle text-navy"></i>')
                 }
             }},
-            {targets: 9, createdCell: function (td, cellData, rowData) {
-                var conn_btn = '<a href="{% url "terminal:web-terminal" %}?id={{ DEFAULT_PK }}" class="btn btn-xs btn-info">{% trans "Connect" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                $(td).html(conn_btn)
-            }}
+{#            {targets: 9, createdCell: function (td, cellData, rowData) {#}
+{#                var conn_btn = '<a href="{% url "terminal:web-terminal" %}?id={{ DEFAULT_PK }}" class="btn btn-xs btn-info">{% trans "Connect" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);#}
+{#                $(td).html(conn_btn)#}
+{#            }}#}
         ],
         ajax_url: '{% url "api-assets:user-asset-list" %}',
         columns: [
             {data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" },
             {data: "get_type_display" }, {data: "get_env_display"}, {data: "hardware_info"},
-            {data: "is_active" }, {data: "is_connective"}, {data: "id"}
+            {data: "is_active" }, {data: "is_connective"}
         ],
         op_html: $('#actions').html()
     };

apps/templates/_head_css_js.html

@@ -2,7 +2,7 @@
 
 <!-- css file -->
 <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
-<link href="{% static 'css/font-awesome.css' %}" rel="stylesheet">
+<link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet">
 <link href="{% static 'css/plugins/toastr/toastr.min.css' %}" rel="stylesheet">
 <link href="{% static 'css/plugins/sweetalert/sweetalert.css' %}" rel="stylesheet">
 <link href="{% static 'css/style.css' %}" rel="stylesheet">

apps/templates/_nav.html

@@ -51,9 +51,15 @@
         <li id="session-online"><a href="{% url 'terminal:session-online-list' %}">{% trans 'Session online' %}</a></li>
         <li id="session-offline"><a href="{% url 'terminal:session-offline-list' %}">{% trans 'Session offline' %}</a></li>
         <li id="command"><a href="{% url 'terminal:command-list' %}">{% trans 'Command' %}</a></li>
+        <li>
+            <a href="{% url 'terminal:web-terminal' %}" target="_blank">
+                {% trans 'Web terminal' %}
+            </a>
+        </li>
     </ul>
 </li>
 
+
 {#<li id="">#}
 {#    <a href="#">#}
 {#        <i class="fa fa-download"></i> <span class="nav-label">{% trans 'File' %}</span><span class="fa arrow"></span>#}

apps/templates/_nav_user.html

@@ -8,4 +8,9 @@
     <a href="{% url 'users:user-profile' %}">
         <i class="fa fa-user" ></i> <span class="nav-label">{% trans 'Profile' %}</span><span class="label label-info pull-right"></span>
     </a>
+</li>
+<li >
+    <a href="{% url 'terminal:web-terminal' %}" target="_blank"><i class="fa fa-window-maximize"></i>
+        <span class="nav-label">{% trans 'Web terminal' %}</span>
+    </a>
 </li>
\ No newline at end of file