github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix left's users logout (#446) 

* fix left's users logout

* fix issues 445
pull/453/head
njqaaa 2017-05-25 14:12:16 +08:00 committed by 老广
parent 18169251fa
commit dd6c82b168
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/user.py
View File

@ -194,7 +194,7 @@ class SystemUser(models.Model):
for asset in asset_group.assets.all(): for asset in asset_group.assets.all():
setattr(asset, 'is_inherit_from_asset_groups', True) setattr(asset, 'is_inherit_from_asset_groups', True)
setattr(asset, 'inherit_from_asset_groups', 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) assets.add(asset)
return assets return assets

2
apps/templates/_user_profile.html
View File

@ -19,7 +19,7 @@
<li><a href="{% url 'users:user-profile' %}">{% trans 'Profile' %}</a></li> <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><a href="{% url 'users:user-profile-update' %}">{% trans 'Profile settings' %}</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="">{% trans 'Logout' %}</a></li> <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
</ul> </ul>
</div> </div>
<div class="logo-element"> <div class="logo-element">