darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2180 from alphagov/service-model

Browse Source 
Make a service model
This commit is contained in:
Chris Hill-Scott
2018-07-31 13:31:09 +01:00
committed by GitHub
parent 9d2e0ae2f3 41e0f7941f
commit b35f6e9d5f
20 changed files with 156 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/main/views/dashboard.py
View File

@@ -152,7 +152,7 @@ def usage(service_id):
yearly_usage = billing_api_client.get_service_usage_ft(service_id, year)
usage_template = 'views/usage.html'
if 'letter' in current_service['permissions']:
if current_service.has_permission('letter'):
usage_template = 'views/usage-with-letters.html'
return render_template(
usage_template,
@@ -238,7 +238,7 @@ def inbox_download(service_id):
def get_inbox_partials(service_id):
page = int(request.args.get('page', 1))
if 'inbound_sms' not in current_service['permissions']:
if not current_service.has_permission('inbound_sms'):
abort(403)
inbound_messages_data = service_api_client.get_most_recent_inbound_sms(service_id, page=page)
@@ -290,7 +290,7 @@ def get_dashboard_partials(service_id):
stats = service_api_client.get_service_statistics(service_id, today_only=False)
column_width, max_notifiction_count = get_column_properties(
number_of_columns=(
3 if 'letter' in current_service['permissions'] else 2
3 if current_service.has_permission('letter') else 2
)
)
dashboard_totals = get_dashboard_totals(stats),
@@ -310,7 +310,7 @@ def get_dashboard_partials(service_id):
'views/dashboard/_inbox.html',
inbound_sms_summary=(
service_api_client.get_inbound_sms_summary(service_id)
if 'inbound_sms' in current_service['permissions'] else None
if current_service.has_permission('inbound_sms') else None
),
),
'totals': render_template(