Skip to content

Commit 2aea3e8

Browse files
committed
Add sorting functionality to author name
1 parent f37cf21 commit 2aea3e8

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

nmdc_server/crud.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,11 +631,18 @@ def can_edit_entire_submission(db: Session, submission_id: str, user_orcid: str)
631631

632632
def get_submissions_for_user(db: Session, user: models.User, column_sort: str, order: str):
633633
"""Return all submissions that a user has permission to view."""
634-
all_submissions = db.query(models.SubmissionMetadata).order_by(
635-
getattr(models.SubmissionMetadata, column_sort).asc()
636-
if order == "asc"
637-
else getattr(models.SubmissionMetadata, column_sort).desc()
634+
column = (
635+
models.User.name
636+
if column_sort == "author.name"
637+
else getattr(models.SubmissionMetadata, column_sort)
638638
)
639+
640+
all_submissions = (
641+
db.query(models.SubmissionMetadata)
642+
.join(models.User, models.SubmissionMetadata.author_id == models.User.id)
643+
.order_by(column.asc() if order == "asc" else column.desc())
644+
)
645+
639646
if user.is_admin:
640647
return all_submissions
641648

web/src/views/SubmissionPortal/Components/SubmissionList.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const headers: DataTableHeader[] = [
2424
{
2525
text: 'Author',
2626
value: 'author.name',
27-
sortable: false,
2827
},
2928
{
3029
text: 'Template',

0 commit comments

Comments
 (0)