From 79e81340dc837df84799cd3cad95d44bfde87383 Mon Sep 17 00:00:00 2001
From: "ibuler@qq.com" <ibuler@qq.com>
Date: Wed, 21 Oct 2015 22:39:53 +0800
Subject: [PATCH] modify log

---
 jperm/perm_api.py             |  3 ++-
 templates/jperm/perm_log.html | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/jperm/perm_api.py b/jperm/perm_api.py
index 0202ef19b..585fa3cbf 100644
--- a/jperm/perm_api.py
+++ b/jperm/perm_api.py
@@ -204,7 +204,8 @@ def _public_perm_api(info):
             new_assets.extend(user_group_permed(user_group).get('assets', []))
 
         perm_info = {
-            'new': {'action': 'new user: ' + user.name, 'users': [user], 'assets': new_assets}
+            'action': 'new user: ' + user.name,
+            'new': {'users': [user], 'assets': new_assets}
         }
     elif info.get('type') == 'edit_user':
         new_assets = []
diff --git a/templates/jperm/perm_log.html b/templates/jperm/perm_log.html
index b24a868a1..ead5f399d 100644
--- a/templates/jperm/perm_log.html
+++ b/templates/jperm/perm_log.html
@@ -40,7 +40,8 @@
                         <thead>
                             <tr>
                                 <th class="text-center">日期</th>
-                                <th class="text-center">结果</th>
+                                <th class="text-center">动作</th>
+                                <th class="text-center">成功</th>
                                 <th class="text-center">完成</th>
                             </tr>
                         </thead>
@@ -48,10 +49,13 @@
                         {% for log in logs %}
                             <tr class="gradeX">
                                 <td class="text-center"> {{ log.datetime | date:"Y-n-d G:i:s" }} </td>
+                                <td class="text-center"> {{ log.action }} </td>
                                 <td class="text-center">
-                                    {{ log.result | result2bool | safe }}
+                                    <a class="log_result" value="{{ log.results }}">
+                                    {{ log.is_success | yesno:"是,否,为止" }}
+                                    </a>
                                 </td>
-                                <td class="text-center"> {{ log.is_finished | yesno:"是,否,为止" }} </td>
+                                <td class="text-center"> {{ log.is_finish | yesno:"是,否,为止" }} </td>
                             </tr>
                         {% endfor %}
                         </tbody>
@@ -70,4 +74,15 @@
     </div>
 </div>
 
+{% endblock %}
+
+{% block self_footer_js %}
+<script>
+$('document').ready(function(){
+    $('.log_result').click(function(){
+        alert($(this).attr('value'))
+    })
+})
+</script>
+
 {% endblock %}
\ No newline at end of file