Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from PGScatalog:master #132

Merged
merged 2 commits into from
Apr 19, 2024
Merged

[pull] master from PGScatalog:master #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12e43a
Fix CSRF issue with the Browse Publications page
ens-lgil Apr 19, 2024
1f261e2
Merge pull request #353 from ens-lgil/feature/new_browse_scores_page_2
fyvon Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catalog/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# e.g.: /browse/traits/
path('browse/traits/', cache_page(cache_time)(views.browse_traits), name='Browse Traits'),
# e.g.: /browse/studies/
path('browse/studies/', cache_page(cache_time)(views.browse_publications), name='Browse Publications'),
path('browse/studies/', views.browse_publications, name='Browse Publications'),

# e.g.: /latest_release/
path('latest_release/', cache_page(cache_time)(views.latest_release), name='Latest Release'),
Expand Down
6 changes: 3 additions & 3 deletions catalog/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def browse_scores(request):
page_rows_number = len(table.page)
page_number = table.page.number
table.row_start = rows_per_page * (page_number - 1) + 1
table.row_end = table.row_start - 1 + page_rows_number;
table.row_end = table.row_start - 1 + page_rows_number

context = {
'view_name': 'Polygenic Scores (PGS)',
Expand Down Expand Up @@ -432,7 +432,7 @@ def browse_publications(request):
page_rows_number = len(table.page)
page_number = table.page.number
table.row_start = rows_per_page * (page_number - 1) + 1
table.row_end = table.row_start - 1 + page_rows_number;
table.row_end = table.row_start - 1 + page_rows_number

context = {
'view_name': 'Publications',
Expand Down Expand Up @@ -696,7 +696,7 @@ def efo(request, efo_id):
return redirect_with_upper_case_id(request, url_dir, efo_id)

exclude_children = False
include_children = request.GET.get('include_children');
include_children = request.GET.get('include_children')
if include_children:
if include_children.lower() == 'false':
exclude_children = True
Expand Down
Loading