darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 14:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dont-send-message-twice

Browse Source
This commit is contained in:
Rebecca Law
2016-11-28 16:43:17 +00:00
parent be113e031f 1b846f3e74
commit 3267a54ded
11 changed files with 448 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/notifications/rest.py
View File

@@ -170,8 +170,8 @@ def get_notification_by_id(notification_id):
def get_all_notifications():
data = notifications_filter_schema.load(request.args).data
include_jobs = data.get('include_jobs', False)
page = data['page'] if 'page' in data else 1
page_size = data['page_size'] if 'page_size' in data else current_app.config.get('PAGE_SIZE')
page = data.get('page', 1)
page_size = data.get('page_size', current_app.config.get('PAGE_SIZE'))
limit_days = data.get('limit_days')
pagination = notifications_dao.get_notifications_for_service(