Skip to content
Snippets Groups Projects
Commit 2850665b authored by David Schmitz's avatar David Schmitz
Browse files

feature/admin_user_delete_with_owned_rule_reassigning: fix

parent 36dce798
No related merge requests found
......@@ -61,7 +61,6 @@ class UserProfile(models.Model):
#logger.info("get_owned_rules(): self="+str(self)+" => routes_owned="+str(routes_owned))
return routes_owned
@property
def get_related_user__for_adopting_on_user_deletion(self):
user = self.user
users_peers = self.peers.all()
......@@ -80,7 +79,8 @@ class UserProfile(models.Model):
user_related1=user2
break
return user_related1
logger.info("get_related_user__for_adopting_on_user_deletion(): => return="+str(user_related1)+", "+str(users_peers1))
return (user_related1, users_peers1)
# deleting of rules by this account is allowed
def is_delete_allowed(self):
......@@ -121,7 +121,7 @@ def user_owned_rules_adopt_to_related_user(user):
# break
# logger.info("user_owned_rules_adopt_to_related_user(): => user_related1="+str(user_related1))
user_related1 = user.userprofile.get_related_user__for_adopting_on_user_deletion()
(user_related1, users_peers1) = user.userprofile.get_related_user__for_adopting_on_user_deletion()
if user_related1!=None:
if len(routes_owned)>0:
......
......@@ -102,7 +102,7 @@ class UserProfileAdmin(UserAdmin):
if len(adopted_rules)>0:
messages.set_level(request, messages.INFO)
messages.error(request, 'additional info: the rules '+str(adopted_rules)+' were re-assigned to remaining user '+str(adoting_user)+' of peer '+str(users_peer1))
messages.info(request, 'additional info: the rules '+str(adopted_rules)+' were re-assigned to remaining user '+str(adoting_user)+' of peer '+str(users_peer1))
super().delete_model(request, client)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment