File tree 3 files changed +5
-9
lines changed 3 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ def user_detail(request):
108
108
request .db .query (Role )
109
109
.join (User )
110
110
.filter (Role .user == user )
111
- .order_by (Role .role_name , Role .package_name )
111
+ .order_by (Role .role_name , Role .project_id )
112
112
.all ()
113
113
)
114
114
Original file line number Diff line number Diff line change @@ -59,18 +59,18 @@ def __init__(self, request):
59
59
def active_projects (self ):
60
60
""" Return all the projects for with the user is a sole owner """
61
61
projects_owned = (
62
- self .request .db .query (Project )
62
+ self .request .db .query (Project . id )
63
63
.join (Role .project )
64
64
.filter (Role .role_name == "Owner" , Role .user == self .request .user )
65
65
.subquery ()
66
66
)
67
67
68
68
with_sole_owner = (
69
- self .request .db .query (Role .package_name )
69
+ self .request .db .query (Role .package_id )
70
70
.join (projects_owned )
71
71
.filter (Role .role_name == "Owner" )
72
- .group_by (Role .package_name )
73
- .having (func .count (Role .package_name ) == 1 )
72
+ .group_by (Role .package_id )
73
+ .having (func .count (Role .package_id ) == 1 )
74
74
.subquery ()
75
75
)
76
76
Original file line number Diff line number Diff line change @@ -70,10 +70,6 @@ class Role(db.Model):
70
70
user = orm .relationship (User , lazy = False )
71
71
project = orm .relationship ("Project" , lazy = False )
72
72
73
- @property
74
- def package_name (self ):
75
- return project .name
76
-
77
73
def __gt__ (self , other ):
78
74
"""
79
75
Temporary hack to allow us to only display the 'highest' role when
You can’t perform that action at this time.
0 commit comments