From 000c764ca3e324edc23603cf24ce50bdb126e138 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 22 Aug 2021 17:40:28 -0400 Subject: [PATCH 1/2] Fix bandaid on migrations...let's call it a cast --- app/migrations/20210819155737_permissions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/migrations/20210819155737_permissions.py b/app/migrations/20210819155737_permissions.py index fc75ab94..81420c49 100644 --- a/app/migrations/20210819155737_permissions.py +++ b/app/migrations/20210819155737_permissions.py @@ -2,8 +2,8 @@ import peewee def migrate(migrator, database, **kwargs): - migrator.drop_columns('user_servers', permissions=peewee.CharField(default="00000000")) # First argument can be model class OR table name - migrator.add_columns('role_servers', permissions=peewee.CharField(default="00000000")) # First argument can be model class OR table name + migrator.drop_columns('user_servers', ['permissions']) # First argument can be model class OR table name + #migrator.add_columns('role_servers', permissions=peewee.CharField(default="00000000")) # First argument can be model class OR table name """ Write your migrations here. """ From d83fd737559d35e258b0357a52f9fc4636d2042d Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 22 Aug 2021 17:42:12 -0400 Subject: [PATCH 2/2] Fix models error when trying to edit admin username --- app/classes/shared/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/shared/models.py b/app/classes/shared/models.py index 4b583202..6a1d4809 100644 --- a/app/classes/shared/models.py +++ b/app/classes/shared/models.py @@ -576,7 +576,7 @@ class db_shortcuts: elif base_data[key] != user_data[key]: up_data[key] = user_data[key] up_data['last_update'] = helper.get_time_as_string() - logger.debug("user: {} +role:{} -role:{} +server:{} -server{}".format(user_data, added_roles, removed_roles)) + logger.debug("user: {} +role:{} -role:{}".format(user_data, added_roles, removed_roles)) with database.atomic(): for role in added_roles: User_Roles.get_or_create(user_id=user_id, role_id=role)