Allowing the role-user associated to be updated. (#396)
* Allowing the role-user associated to be updated. * Fixing tests * Fixing tests, for real.
This commit is contained in:
@@ -27,5 +27,5 @@ class Role(db.Model):
|
||||
authority_id = Column(Integer, ForeignKey('authorities.id'))
|
||||
authorities = relationship("Authority", secondary=roles_authorities, passive_deletes=True, backref="role", cascade='all,delete')
|
||||
user_id = Column(Integer, ForeignKey('users.id'))
|
||||
users = relationship("User", secondary=roles_users, viewonly=True, backref="role")
|
||||
users = relationship("User", secondary=roles_users, passive_deletes=True, backref="role")
|
||||
certificates = relationship("Certificate", secondary=roles_certificates, backref="role")
|
||||
|
@@ -27,8 +27,7 @@ def update(role_id, name, description, users):
|
||||
role = get(role_id)
|
||||
role.name = name
|
||||
role.description = description
|
||||
if users:
|
||||
role.users = users
|
||||
role.users = users
|
||||
database.update(role)
|
||||
return role
|
||||
|
||||
@@ -45,8 +44,10 @@ def create(name, password=None, description=None, username=None, users=None):
|
||||
:return:
|
||||
"""
|
||||
role = Role(name=name, description=description, username=username, password=password)
|
||||
|
||||
if users:
|
||||
role.users = users
|
||||
|
||||
return database.create(role)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user