Mercurial > kallithea

changeset 8321:84487755bb2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge stable
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 10 Apr 2020 15:32:26 +0200
parents f8314738030a (current diff) b1b1f69b1f28 (diff)
children de0f50a7b86a
files kallithea/model/db.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/db.py	Sun Nov 03 16:39:59 2019 +0100
+++ b/kallithea/model/db.py	Fri Apr 10 15:32:26 2020 +0200
@@ -820,8 +820,8 @@
     users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
     users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
-    user_user_group_to_perm = relationship('UserUserGroupToPerm ', cascade='all')
-    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
+    user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
+    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
 
     owner = relationship('User')