From dd6c82b168d1990d3810872bb9069741b8fa8ab3 Mon Sep 17 00:00:00 2001
From: njqaaa <hy2900822@126.com>
Date: Thu, 25 May 2017 14:12:16 +0800
Subject: [PATCH] fix left's users logout (#446)

* fix left's users logout

* fix issues 445
---
 apps/assets/models/user.py        | 2 +-
 apps/templates/_user_profile.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py
index a07aae5de..e7a817428 100644
--- a/apps/assets/models/user.py
+++ b/apps/assets/models/user.py
@@ -194,7 +194,7 @@ class SystemUser(models.Model):
             for asset in asset_group.assets.all():
                 setattr(asset, 'is_inherit_from_asset_groups', True)
                 setattr(asset, 'inherit_from_asset_groups',
-                        getattr(asset, b'inherit_from_asset_groups', set()).add(asset_group))
+                        getattr(asset, 'inherit_from_asset_groups', set()).add(asset_group))
                 assets.add(asset)
         return assets
 
diff --git a/apps/templates/_user_profile.html b/apps/templates/_user_profile.html
index a2da99d33..b7dc0f5db 100644
--- a/apps/templates/_user_profile.html
+++ b/apps/templates/_user_profile.html
@@ -19,7 +19,7 @@
             <li><a href="{% url 'users:user-profile' %}">{% trans 'Profile' %}</a></li>
             <li><a href="{% url 'users:user-profile-update' %}">{% trans 'Profile settings' %}</a></li>
             <li class="divider"></li>
-            <li><a href="">{% trans 'Logout' %}</a></li>
+            <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
         </ul>
     </div>
     <div class="logo-element">