Przeglądaj źródła

fixed ordering with pagination

joel
Simon Bowie 1 rok temu
rodzic
commit
6cef500303
3 zmienionych plików z 6 dodań i 6 usunięć
  1. +2
    -2
      web/app/book.py
  2. +2
    -2
      web/app/practice.py
  3. +2
    -2
      web/app/tool.py

+ 2
- 2
web/app/book.py Wyświetl plik

@@ -33,7 +33,7 @@ def get_books():
intro_text = markdown.markdown(intro_text)

# DATABASE QUERY
books_query = Resource.query.filter_by(type=resource_type).order_by(Resource.name)
books_query = Resource.query.filter_by(type=resource_type)

# FILTERING
for key in request.args.keys():
@@ -47,7 +47,7 @@ def get_books():
books_query = books_query.filter_by(**kwargs)

# finalise the query and add pagination
books = books_query.paginate(page=page, per_page=5)
books = books_query.order_by(Resource.name).paginate(page=page, per_page=5)

# FILTERS MENU
# get values for filter menu dropdowns

+ 2
- 2
web/app/practice.py Wyświetl plik

@@ -34,7 +34,7 @@ def get_practices():
intro_text = markdown.markdown(intro_text)

# DATABASE QUERY
practices_query = Resource.query.filter_by(type=resource_type).order_by(Resource.name)
practices_query = Resource.query.filter_by(type=resource_type)

# temporarily removing incomplete practices from main list
practices_query = Resource.query.filter(
@@ -49,7 +49,7 @@ def get_practices():
))

# finalise the query and add pagination
practices = practices_query.paginate(page=page, per_page=5)
practices = practices_query.order_by(Resource.name).paginate(page=page, per_page=5)

# POST-FILTERING PROCESSING
# if view is 'expanded' then append relationships

+ 2
- 2
web/app/tool.py Wyświetl plik

@@ -33,7 +33,7 @@ def get_tools():
intro_text = markdown.markdown(intro_text)

# DATABASE QUERY
tools_query = Resource.query.filter_by(type=resource_type).order_by(Resource.name)
tools_query = Resource.query.filter_by(type=resource_type)

# FILTERING
for key in request.args.keys():
@@ -50,7 +50,7 @@ def get_tools():
tools_query = tools_query.filter_by(**kwargs)

# finalise the query and add pagination
tools = tools_query.paginate(page=page, per_page=5)
tools = tools_query.order_by(Resource.name).paginate(page=page, per_page=5)

# FILTERS MENU
# get values for filter menu dropdowns

Ładowanie…
Anuluj
Zapisz