darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 10:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #970 from alphagov/whitelist-live

Browse Source 
Make whitelist available to live services
This commit is contained in:
Chris Hill-Scott
2016-10-10 11:39:11 +01:00
committed by GitHub
parent e714f7adff 73469c1067
commit 5bb700ac81
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/api_keys.py
+1 -1
View File
@@ -73,7 +73,7 @@ def create_api_key(service_id):
', once this service is not in trial mode' if current_service['restricted'] else '' ', once this service is not in trial mode' if current_service['restricted'] else ''
)), )),
(KEY_TYPE_TEST, 'Simulate sending messages to anyone'), (KEY_TYPE_TEST, 'Simulate sending messages to anyone'),
(KEY_TYPE_TEAM, 'Only send messages to members of your team') (KEY_TYPE_TEAM, 'Only send messages to your team or whitelist')
] ]
if form.validate_on_submit(): if form.validate_on_submit():
secret = api_key_api_client.create_api_key( secret = api_key_api_client.create_api_key(
app/templates/views/api/index.html
+9 -18
View File
@@ -23,24 +23,15 @@
{% endif %} {% endif %}
<nav class="grid-row bottom-gutter-1-2"> <nav class="grid-row bottom-gutter-1-2">
{% if current_service.restricted %} <div class="column-one-third">
<div class="column-one-third"> <a class="pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
<a class="pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a> </div>
</div> <div class="column-one-third">
<div class="column-one-third"> <a class="pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Whitelist</a>
<a class="pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Whitelist</a> </div>
</div> <div class="column-one-third">
<div class="column-one-third"> <a class="pill-separate-item" href="{{ url_for('.api_documentation', service_id=current_service.id) }}">Documentation</a>
<a class="pill-separate-item" href="{{ url_for('.api_documentation', service_id=current_service.id) }}">Documentation</a> </div>
</div>
{% else %}
<div class="column-half">
<a class="pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
</div>
<div class="column-half">
<a class="pill-separate-item" href="{{ url_for('.api_documentation', service_id=current_service.id) }}">Documentation</a>
</div>
{% endif %}
</nav> </nav>
<div class="grid-row"> <div class="grid-row">
app/templates/views/api/keys.html
+1 -1
View File
@@ -38,7 +38,7 @@
{% if item.key_type == 'normal' %} {% if item.key_type == 'normal' %}
<span class="visually-hidden">Normal</span> <span class="visually-hidden">Normal</span>
{% elif item.key_type == 'team' %} {% elif item.key_type == 'team' %}
Only sends to team members Only sends to team members or whitelist
{% elif item.key_type == 'test' %} {% elif item.key_type == 'test' %}
Simulates sending messages Simulates sending messages
{% endif %} {% endif %}