darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-22 08:21:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into get-stats-for-today

Browse Source
This commit is contained in:
Leo Hemsted
2016-08-01 10:36:56 +01:00
parent 48eff9a2ee ce9f2e808b
commit 717f1fd4a0
6 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/service/rest.py
View File

@@ -34,7 +34,7 @@ from app.schemas import (
user_schema,
from_to_date_schema,
permission_schema,
notification_status_schema,
notification_with_template_schema,
notifications_filter_schema,
detailed_service_schema
)
@@ -225,7 +225,7 @@ def get_all_notifications_for_service(service_id):
kwargs = request.args.to_dict()
kwargs['service_id'] = service_id
return jsonify(
notifications=notification_status_schema.dump(pagination.items, many=True).data,
notifications=notification_with_template_schema.dump(pagination.items, many=True).data,
page_size=page_size,
total=pagination.total,
links=pagination_links(