Merge remote-tracking branch 'gitlab/main'

This commit is contained in:
bniwredyc 2022-12-20 14:24:37 +01:00
commit eeedd87541
3 changed files with 4 additions and 1 deletions

3
.gitignore vendored
View File

@ -135,7 +135,8 @@ discours.crt
discours.pem discours.pem
Pipfile.lock Pipfile.lock
migration/data migration/data/*
!migration/data/.gitkeep
migration/content/**/*.md migration/content/**/*.md
.obsidian .obsidian

0
migration/data/.gitkeep Normal file
View File

View File

@ -98,6 +98,8 @@ def migrate(entry):
session.query(User).filter(User.slug == user_dict["slug"]).first() session.query(User).filter(User.slug == user_dict["slug"]).first()
) )
old_user.oid = oid old_user.oid = oid
old_user.password = user_dict["password"]
session.commit()
user = old_user user = old_user
if not user: if not user:
print("[migration] ERROR: cannot find user " + user_dict["slug"]) print("[migration] ERROR: cannot find user " + user_dict["slug"])