fix left's users logout (jumpserver#446)

* fix left's users logout * fix issues 445
haiya512 · May 25, 2017 · dd6c82b · dd6c82b
1 parent 1816925
commit dd6c82b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py
@@ -194,7 +194,7 @@ def get_assets_inherit_from_asset_groups(self):
             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
@@ -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">