Merge pull request #2968 from jumpserver/dev

Dev

apps/jumpserver/const.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 #
-VERSION = '1.5.1'
+VERSION = '1.5.2'

apps/perms/templates/perms/asset_permission_detail.html

@@ -206,7 +206,7 @@ $(document).ready(function () {
 })
 .on('click', '.btn-delete-perm', function () {
     var $this = $(this);
-    var name = "{{ asset_permission.name }}";
+    var name = "{{ object.name }}";
     var uid = "{{ object.id }}";
     var the_url = '{% url "api-perms:asset-permission-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
     var redirect_url = "{% url 'perms:asset-permission-list' %}";