darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:26:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't return hidden templates in API service template responses

Browse Source 
Brings back filtering hidden templates from the API responses.
This commit is contained in:
Alexey Bezhan
2018-02-26 13:18:51 +00:00
parent dc99fe5ff3
commit 984a5050db
3 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/templates_dao.py
View File

@@ -75,9 +75,10 @@ def dao_get_template_by_id_and_service_id(template_id, service_id, version=None)
if version is not None:
return TemplateHistory.query.filter_by(
id=template_id,
hidden=False,
service_id=service_id,
version=version).one()
return Template.query.filter_by(id=template_id, service_id=service_id).one()
return Template.query.filter_by(id=template_id, hidden=False, service_id=service_id).one()
def dao_get_template_by_id(template_id, version=None):
@@ -93,6 +94,7 @@ def dao_get_all_templates_for_service(service_id, template_type=None):
return Template.query.filter_by(
service_id=service_id,
template_type=template_type,
hidden=False,
archived=False
).order_by(
asc(Template.name),
@@ -101,6 +103,7 @@ def dao_get_all_templates_for_service(service_id, template_type=None):
return Template.query.filter_by(
service_id=service_id,
hidden=False,
archived=False
).order_by(
asc(Template.name),
@@ -110,7 +113,8 @@ def dao_get_all_templates_for_service(service_id, template_type=None):
def dao_get_template_versions(service_id, template_id):
return TemplateHistory.query.filter_by(
service_id=service_id, id=template_id
service_id=service_id, id=template_id,
hidden=False,
).order_by(
desc(TemplateHistory.version)
).all()