From 227cc4e965314fc7773f6e61a0ca25b3042e3655 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Tue, 31 Jul 2018 11:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=20[Update]=20=E6=9B=B4=E6=96=B0org=E4=B8=8B?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E7=9A=84=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20(#1619)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 更新org下普通用户查看资产详情，只显示数据

* [Update] 优化org下普通用户查看资产详情前端代码
---
 .../assets/_user_asset_detail_modal.html      | 21 +++++++++
 .../templates/assets/user_asset_list.html     | 45 +++++++++++++++++--
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 apps/assets/templates/assets/_user_asset_detail_modal.html

diff --git a/apps/assets/templates/assets/_user_asset_detail_modal.html b/apps/assets/templates/assets/_user_asset_detail_modal.html
new file mode 100644
index 000000000..b78854d2e
--- /dev/null
+++ b/apps/assets/templates/assets/_user_asset_detail_modal.html
@@ -0,0 +1,21 @@
+{% extends '_modal.html' %}
+{% load i18n %}
+{% load static %}
+
+{% block modal_id %}user_asset_detail_modal{% endblock %}
+
+{% block modal_title %}{% trans "Asset detail" %}{% endblock %}
+
+{% block modal_body %}
+    <div class="ibox-content">
+        <table class="table">
+            <tbody id="asset_detail_tbody">
+            </tbody>
+        </table>
+    </div>
+
+{% endblock %}
+
+{% block modal_button %}
+<button data-dismiss="modal" class="btn btn-white" type="button">{% trans "Close" %}</button>
+{% endblock %}
diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index 649418aed..a40cc9e52 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -55,8 +55,11 @@
        </div>
    </div>
 </div>
+
+{% include 'assets/_user_asset_detail_modal.html' %}
 {% endblock %}
 
+
 {% block custom_foot_js %}
 <script>
 var zTree, rMenu, asset_table;
@@ -71,11 +74,15 @@ function initTable() {
     var options = {
         ele: $('#user_assets_table'),
         columnDefs: [
+            {#{targets: 1, createdCell: function (td, cellData, rowData) {#}
+            {#        {% url 'assets:asset-detail' pk=DEFAULT_PK as the_url  %}#}
+            {#        var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';#}
+            {#        $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));#}
+            {#    }},#}
             {targets: 1, createdCell: function (td, cellData, rowData) {
-                {% url 'assets:asset-detail' pk=DEFAULT_PK as the_url  %}
-                var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-            }},
+                var detail_btn = '<a class="asset_detail" asset-id="rowData_id" data-toggle="modal" data-target="#user_asset_detail_modal" tabindex="0">'+ cellData +'</a>'
+                $(td).html(detail_btn.replace("rowData_id", rowData.id));
+                }},
             {targets: 3, createdCell: function (td, cellData) {
                 if (!cellData) {
                     $(td).html('<i class="fa fa-times text-danger"></i>')
@@ -165,7 +172,37 @@ function initTree() {
 
 $(document).ready(function () {
     initTree();
+})
+.on('click', '.asset_detail', function() {
+    var data = asset_table.ajax.json();
+    var asset_id = this.getAttribute("asset-id");
+    var trs = '';
+    var desc = {
+        'hostname': "{% trans 'Hostname' %}",
+        'ip': "{% trans 'IP' %}",
+        'port': "{% trans 'Port' %}",
+        'protocol': "{% trans 'Protocol' %}",
+        'platform': "{% trans 'Platform' %}",
+        'os': "{% trans 'OS' %}",
+        'system_users_join': "{% trans 'System user' %}",
+        'domain': "{% trans 'Domain' %}",
+        'is_active': "{% trans 'Is active' %}",
+        'comment': "{% trans 'Comment' %}"
+        {#'date_joined': "{% trans 'Date joined' %}",#}
+    };
+    $.each(data, function(index, value){
+        if(value.id === asset_id){
+            for(var i in desc){
+                trs += "<tr>\n" +
+                  "<td>"+ desc[i] + ":</td>"+
+                  "<td><b>"+ (value[i] === null?'':value[i]) + "</b></td>\n" +
+                  "</tr>";
+            }
+        }
+    });
+    $('#asset_detail_tbody').html(trs)
 });
+
 </script>
 
 {% endblock %}
\ No newline at end of file