Pagination #58
Closed
Pagination #58
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mxmeinhold
requested changes
Mar 27, 2022
jabbate19
force-pushed
the
pagination
branch
2 times, most recently
from
20eee16 to
0ea98c5
Compare
mxmeinhold
reviewed
Mar 31, 2022
Comment on lines
+75
to
+76
| rows = query.count() | ||
| rows = int(rows // 10 + bool(rows % 10)) |
There was a problem hiding this comment.
same comment on the naming of rows as your other pagination pr. this feels like it could be named better
Comment on lines
88
to
+93
| return render_template("main.html", db_files=db_files, | ||
| get_date_modified=get_date_modified, s3_bucket=s3_bucket, | ||
| auth_dict=auth_dict, harolds=harolds, tour_harolds=tour_harolds, | ||
| is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=False) | ||
| is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=False, | ||
| current="", page=page, rows=rows, begin=max(1, page-6), | ||
| end=min(page+6, rows) + 1) |
There was a problem hiding this comment.
nit: one arg per line. this has gotten too long to be readable like this
Comment on lines
+92
to
+93
| current="", page=page, rows=rows, begin=max(1, page-6), | ||
| end=min(page+6, rows) + 1) |
There was a problem hiding this comment.
same comment about begin and end as your other pagination pr. can this be done in the jinja since you're passing page?
Comment on lines
+106
to
+124
| rows = query.count() | ||
| rows = int(rows // 10 + bool(rows % 10)) | ||
|
|
||
| if page > rows or page < 1: | ||
| return "Page Out of Bounds", 404 | ||
|
|
||
| is_rtp = ldap_is_rtp(auth_dict["uid"]) | ||
| is_eboard = ldap_is_eboard(auth_dict["uid"]) | ||
|
|
||
| # Retrieve list of files for templating | ||
| db_files = File.query.filter_by(author=auth_dict["uid"]).all() | ||
| db_files = query.offset((page-1) * 10).limit(10).all() | ||
| harolds = get_harold_list(auth_dict["uid"]) | ||
| tour_harolds = get_harold_list("root") | ||
| return render_template("main.html", db_files=db_files, | ||
| get_file_s3=get_file_s3, get_date_modified=get_date_modified, | ||
| s3_bucket=s3_bucket, auth_dict=auth_dict, harolds=harolds, | ||
| tour_harolds=tour_harolds, is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=False) | ||
| tour_harolds=tour_harolds, is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=False, | ||
| current="/mine", page=page, rows=rows, begin=max(1, page-6), | ||
| end=min(page+6, rows) + 1) |
There was a problem hiding this comment.
see above re rows, begin, and end
Comment on lines
+139
to
+155
| rows = query.count() | ||
| rows = int(rows // 10 + bool(rows % 10)) | ||
|
|
||
| if page > rows or page < 1: | ||
| return "Page Out of Bounds", 404 | ||
|
|
||
| is_rtp = ldap_is_rtp(auth_dict["uid"]) | ||
| is_eboard = ldap_is_eboard(auth_dict["uid"]) | ||
|
|
||
| tour_harolds = get_harold_list("root") | ||
| db_files = File.query.filter(File.file_hash.in_(harolds)).all() | ||
| db_files = query.offset((page-1) * 10).limit(10).all() | ||
| return render_template("main.html", db_files=db_files, | ||
| get_date_modified=get_date_modified, s3_bucket=s3_bucket, | ||
| auth_dict=auth_dict, harolds=harolds, tour_harolds=tour_harolds, | ||
| is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=False) | ||
| is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=False, | ||
| current="/selected", page=page, rows=rows, begin=max(1, page-6), | ||
| end=min(page+6, rows) + 1) |
Comment on lines
+169
to
+185
| rows = query.count() | ||
| rows = int(rows // 10 + bool(rows % 10)) | ||
|
|
||
| if page > rows or page < 1: | ||
| return "Page Out of Bounds", 404 | ||
|
|
||
| is_rtp = ldap_is_rtp(auth_dict["uid"]) | ||
| is_eboard = ldap_is_eboard(auth_dict["uid"]) | ||
|
|
||
| if is_eboard or is_rtp: | ||
| harolds = get_harold_list(auth_dict["uid"]) | ||
| tour_harolds = get_harold_list("root") | ||
| db_files = File.query.filter(File.file_hash.in_(tour_harolds)).all() | ||
| db_files = query.offset((page-1) * 10).limit(10).all() | ||
| return render_template("main.html", db_files=db_files, | ||
| get_date_modified=get_date_modified, s3_bucket=s3_bucket, | ||
| auth_dict=auth_dict, harolds=harolds, tour_harolds=tour_harolds, | ||
| is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=True, is_tour_mode=get_tour_lock_status()) | ||
| is_rtp=is_rtp, is_eboard=is_eboard, is_tour_page=True, is_tour_mode=get_tour_lock_status(), | ||
| current="/tour_page", page=page, rows=rows, begin=max(1, page-6), end=min(page+6, rows) + 1) |
Comment on lines
80
to
+85
| {% if not loop.index0 is divisibleby 2 %} | ||
| </div> | ||
| {% endif %} | ||
| {% if loop.index0 is divisibleby 2 and loop.last %} | ||
| </div> | ||
| {% endif %} |
There was a problem hiding this comment.
Suggested change
| {% if not loop.index0 is divisibleby 2 %} | |
| </div> | |
| {% endif %} | |
| {% if loop.index0 is divisibleby 2 and loop.last %} | |
| </div> | |
| {% endif %} | |
| {% if not loop.index0 is divisibleby 2 or loop.last %} | |
| </div> | |
| {% endif %} |
nit: this could be a bit more compact I think
Comment on lines
+98
to
+102
| {% for num in range(begin, end) %} | ||
| <li class="page-item"> | ||
| <a class="page-link" href="{{ current }}/{{ num }}">{{ num }}</a> | ||
| </li> | ||
| {% endfor %} |
There was a problem hiding this comment.
plan to do anything special for the current page?
| <ul class="pagination pagination-lg justify-content-center"> | ||
| {% if page == 1 %} | ||
| <li class="page-item disabled"> | ||
| <a class="page-link" href="{{ current }}{{ page - 1 }}" tabindex="-1">Previous</a> |
There was a problem hiding this comment.
would request.url work instead of current? doc: https://flask.palletsprojects.com/en/2.0.x/templating/
|
Since whatever happens here is going to carry over to ComputerScienceHouse/Quotefault#68 , let's work it out there and then I'll just re-do it all here after that one is approved |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add Pagination so only 10 are loaded at a time. This will prevent lag on load.
based on #57