Skip to content

Commit df3e04b

Browse files
dstufftewdurbin
authored andcommitted
Fix fallout of Role.package_name removal
1 parent 961b3b7 commit df3e04b

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

warehouse/admin/views/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def user_detail(request):
108108
request.db.query(Role)
109109
.join(User)
110110
.filter(Role.user == user)
111-
.order_by(Role.role_name, Role.package_name)
111+
.order_by(Role.role_name, Role.project_id)
112112
.all()
113113
)
114114

warehouse/manage/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
def user_projects(request):
4343
""" Return all the projects for which the user is a sole owner """
4444
projects_owned = (
45-
request.db.query(Project)
45+
request.db.query(Project.id)
4646
.join(Role.project)
4747
.filter(Role.role_name == "Owner", Role.user == request.user)
4848
.subquery()
4949
)
5050

5151
with_sole_owner = (
52-
request.db.query(Role.package_name)
52+
request.db.query(Role.package_id)
5353
.join(projects_owned)
5454
.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)
5757
.subquery()
5858
)
5959

warehouse/packaging/models.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ class Role(db.Model):
7070
user = orm.relationship(User, lazy=False)
7171
project = orm.relationship("Project", lazy=False)
7272

73-
@property
74-
def package_name(self):
75-
return project.name
76-
7773
def __gt__(self, other):
7874
"""
7975
Temporary hack to allow us to only display the 'highest' role when

0 commit comments

Comments
 (0)