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 42
42
def user_projects (request ):
43
43
""" Return all the projects for which the user is a sole owner """
44
44
projects_owned = (
45
- request .db .query (Project )
45
+ request .db .query (Project . id )
46
46
.join (Role .project )
47
47
.filter (Role .role_name == "Owner" , Role .user == request .user )
48
48
.subquery ()
49
49
)
50
50
51
51
with_sole_owner = (
52
- request .db .query (Role .package_name )
52
+ request .db .query (Role .package_id )
53
53
.join (projects_owned )
54
54
.filter (Role .role_name == "Owner" )
55
- .group_by (Role .package_name )
56
- .having (func .count (Role .package_name ) == 1 )
55
+ .group_by (Role .package_id )
56
+ .having (func .count (Role .package_id ) == 1 )
57
57
.subquery ()
58
58
)
59
59
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