Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync jsondata implementation from viewflow

Browse source
This commit is contained in:
Your Name 2024-07-01 17:51:09 -04:00 • committed by Henri Dickson
parent 9116d4a5bc
commit 7b6c73b7d6
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
catalog/common/jsondata.py
View file

@ -81,7 +81,7 @@ class JSONFieldDescriptor(object):
if hasattr(self.field, "from_json"):
value = self.field.from_json(value)
elif self.field.has_default():
value = self.field.get_default()
value = self.field._get_default()
# if hasattr(self.field, "to_json"):
# json_value[self.field.attname] = self.field.to_json(value)
# else:

2
users/models/user.py
View file

@ -387,7 +387,6 @@ class User(AbstractUser):
account = param.pop("account", None)
with transaction.atomic():
logger.debug(account.access_data)
if account:
if account.platform == Platform.MASTODON:
param["mastodon_username"] = account.account_data["username"]
@ -404,7 +403,6 @@ class User(AbstractUser):
Preference.objects.create(user=new_user)
if account:
account.user = new_user
logger.debug(account.access_data)
account.save()
Takahe.init_identity_for_local_user(new_user)
new_user.identity.shelf_manager