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 @@