Skip to content
Snippets Groups Projects
Commit 7ad0eaf5 authored by Jan Mach's avatar Jan Mach
Browse files

Added implicit searching of ORM relationship objects.

When retrieving for example members of a group list of users was in no particular order. I have fixed that now for all objects where it was relevant.
parent 970e54d6
No related branches found
No related tags found
No related merge requests found
......@@ -172,10 +172,10 @@ class UserModel(MODEL):
locale = sqlalchemy.Column(sqlalchemy.String(20))
timezone = sqlalchemy.Column(sqlalchemy.String(50))
memberships = sqlalchemy.orm.relationship('GroupModel', secondary = _asoc_group_members, back_populates = 'members')
managements = sqlalchemy.orm.relationship('GroupModel', secondary = _asoc_group_managers, back_populates = 'managers')
memberships = sqlalchemy.orm.relationship('GroupModel', secondary = _asoc_group_members, back_populates = 'members', order_by = 'GroupModel.name')
managements = sqlalchemy.orm.relationship('GroupModel', secondary = _asoc_group_managers, back_populates = 'managers', order_by = 'GroupModel.name')
changelogs = sqlalchemy.orm.relationship('ItemChangeLogModel', back_populates = 'author')
changelogs = sqlalchemy.orm.relationship('ItemChangeLogModel', back_populates = 'author', order_by = 'ItemChangeLogModel.createtime')
logintime = sqlalchemy.Column(sqlalchemy.DateTime)
......@@ -238,12 +238,12 @@ class GroupModel(MODEL):
description = sqlalchemy.Column(sqlalchemy.String, nullable = False)
enabled = sqlalchemy.Column(sqlalchemy.Boolean, nullable = False, default = True)
members = sqlalchemy.orm.relationship('UserModel', secondary = _asoc_group_members, back_populates = 'memberships')
managers = sqlalchemy.orm.relationship('UserModel', secondary = _asoc_group_managers, back_populates = 'managements')
members = sqlalchemy.orm.relationship('UserModel', secondary = _asoc_group_members, back_populates = 'memberships', order_by = 'UserModel.fullname')
managers = sqlalchemy.orm.relationship('UserModel', secondary = _asoc_group_managers, back_populates = 'managements', order_by = 'UserModel.fullname')
networks = sqlalchemy.orm.relationship('NetworkModel', back_populates = 'group', cascade = 'all, delete-orphan')
filters = sqlalchemy.orm.relationship('FilterModel', back_populates = 'group', cascade = 'all, delete-orphan')
reports = sqlalchemy.orm.relationship('EventReportModel', back_populates = 'group', cascade = 'all, delete-orphan')
networks = sqlalchemy.orm.relationship('NetworkModel', back_populates = 'group', cascade = 'all, delete-orphan', order_by = 'NetworkModel.netname')
filters = sqlalchemy.orm.relationship('FilterModel', back_populates = 'group', cascade = 'all, delete-orphan', order_by = 'FilterModel.name')
reports = sqlalchemy.orm.relationship('EventReportModel', back_populates = 'group', cascade = 'all, delete-orphan', order_by = 'EventReportModel.label')
settings_rep = sqlalchemy.orm.relationship('SettingsReportingModel', uselist = False, back_populates = 'group', cascade = 'all, delete-orphan')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment