imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Changed the get_number_query() method to the get_query_number() function, so that it is shared by different view classes.

Browse Source
This commit is contained in:
依瑪貓 2020-07-01 00:52:38 +08:00
parent 967c51075c
commit 37cddf478c
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
accounting/views.py
View File

@ -133,25 +133,27 @@ ORDER BY
self.kwargs["subject_code"] + "%"]) self.kwargs["subject_code"] + "%"])
pagination = Pagination( pagination = Pagination(
len(records), len(records),
self.get_number_query("page"), get_query_number(self.request, "page"),
self.get_number_query("page-size"), get_query_number(self.request, "page-size"),
True) True)
start_no = pagination.page_size * (pagination.page_no - 1) start_no = pagination.page_size * (pagination.page_no - 1)
return records[start_no:start_no + pagination.page_size] return records[start_no:start_no + pagination.page_size]
def get_number_query(self, name):
def get_query_number(request, name):
"""Returns a positive number query parameter. """Returns a positive number query parameter.
Args: Args:
request (HttpRequest): The HTTP request
name (str): The name of the query parameter name (str): The name of the query parameter
Returns: Returns:
The parameter value, or None if this parameter does not The parameter value, or None if this parameter does not
exist or is not a positive number exist or is not a positive number
""" """
if name not in self.request.GET: if name not in request.GET:
return None return None
elif not re.match("^[1-9][0-9]*$", self.request.GET[name]): elif not re.match("^[1-9][0-9]*$", request.GET[name]):
return None return None
else: else:
return int(self.request.GET) return int(request.GET)