darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-06 10:38:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't return hidden templates in API service template responses"

Browse Source 
Filtering out hidden templates requires all existing templates to
have `hidden` flag set, which can only be done by a migration after
the code that sets the flag to `False` by default for new templates
has been released.

This removes the filtering logic until the migration has been released.
This commit is contained in:
Alexey Bezhan
2018-02-26 11:40:53 +00:00
parent b44f08bd0f
commit 9b3a9a55c4
3 changed files with 2 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/templates_dao.py
View File

@@ -75,10 +75,9 @@ 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, hidden=False, service_id=service_id).one()
return Template.query.filter_by(id=template_id, service_id=service_id).one()
def dao_get_template_by_id(template_id, version=None):
@@ -94,7 +93,6 @@ 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),
@@ -103,7 +101,6 @@ 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),
@@ -113,8 +110,7 @@ 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,
hidden=False,
service_id=service_id, id=template_id
).order_by(
desc(TemplateHistory.version)
).all()