Skip to content

Commit

Permalink
Merge cf03010 into fd79a78
Browse files Browse the repository at this point in the history
  • Loading branch information
kbecker42 committed Oct 10, 2022
2 parents fd79a78 + cf03010 commit 4ccacf8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.

Documentation and media is under a Creative Commons Attribution License version 3.
Documentation and media is under a Creative Commons Attribution License version 3.
2 changes: 1 addition & 1 deletion pybossa/cache/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def search_lock_status_sorting_result():
# if not sort by lock_status or locked_tasks_in_project is empty/None,
# sort by the column "order_by"
order_by = args.get('order_by')
sql_order_by = 'id ASC' if not (locked_tasks_in_project and order_by) else order_by
sql_order_by = order_by or 'id ASC'
sql_query = sql + sql_order.format(sql_order_by) + sql_limit_offset

results = session.execute(text(sql_query), params)
Expand Down

0 comments on commit 4ccacf8

Please sign in to comment.