Merge pull request #2968 from jumpserver/dev

Dev

Merge pull request #2968 from jumpserver/dev
Dev
3d1d652c · BaiJiangJie · GitHub · eb93e634 · f70567f4 · 3d1d652c
Unverified Commit 3d1d652c authored Jul 16, 2019 by BaiJiangJie Committed by GitHub Jul 16, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

const.py apps/jumpserver/const.py +1 -1

asset_permission_detail.html apps/perms/templates/perms/asset_permission_detail.html +1 -1

No files found.
--- a/apps/jumpserver/const.py
+++ b/apps/jumpserver/const.py
 # -*- coding: utf-8 -*-
 #
-VERSION = '1.5.1'
+VERSION = '1.5.2'
--- a/apps/perms/templates/perms/asset_permission_detail.html
+++ b/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' %}";