diff --git a/jperm/perm_api.py b/jperm/perm_api.py index 0202ef19b6df5cb6a3657b3eadb546d21f33c6e8..585fa3cbfd104a8e9c15f5f2c7278225c8ca2c9b 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 b24a868a171736b9198cd6e7716799a85caecaa4..ead5f399dc981bea7bf9b07e78b45ea4a04e2fe7 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