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

Merge pull request #139 from alphagov/make-service-id-a-uuid

Browse Source 
Update service_id to a UUID from an integer.
This commit is contained in:
Adam Shimali
2016-02-02 14:53:00 +00:00
parent bf10800c12 a4cb35ad3b
commit 658045e6d7
10 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,13 +5,13 @@ from app.main.forms import CreateKeyForm
from app import api_key_api_client
@main.route("/services/<int:service_id>/documentation")
@main.route("/services/<service_id>/documentation")
@login_required
def documentation(service_id):
return render_template('views/documentation.html', service_id=service_id)
@main.route("/services/<int:service_id>/api-keys")
@main.route("/services/<service_id>/api-keys")
@login_required
def api_keys(service_id):
return render_template(
@@ -21,7 +21,7 @@ def api_keys(service_id):
)
@main.route("/services/<int:service_id>/api-keys/create", methods=['GET', 'POST'])
@main.route("/services/<service_id>/api-keys/create", methods=['GET', 'POST'])
@login_required
def create_api_key(service_id):
key_names = [
@@ -39,7 +39,7 @@ def create_api_key(service_id):
)
@main.route("/services/<int:service_id>/api-keys/revoke/<int:key_id>", methods=['GET', 'POST'])
@main.route("/services/<service_id>/api-keys/revoke/<int:key_id>", methods=['GET', 'POST'])
@login_required
def revoke_api_key(service_id, key_id):
key_name = api_key_api_client.get_api_keys(service_id=service_id, key_id=key_id)['apiKeys'][0]['name']

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

@@ -7,7 +7,7 @@ from client.errors import HTTPError
from ._jobs import jobs
@main.route("/services/<int:service_id>/dashboard")
@main.route("/services/<service_id>/dashboard")
@login_required
def service_dashboard(service_id):
try:
@@ -31,4 +31,4 @@ def service_dashboard(service_id):
free_text_messages_remaining='25,000',
spent_this_month='0.00',
has_templates=bool(len(templates)),
service_id=service_id)
service_id=str(service_id))

6
app/main/views/index.py
View File

@@ -24,19 +24,19 @@ def verify_mobile():
return render_template('views/verify-mobile.html')
@main.route("/services/<int:service_id>/send-email")
@main.route("/services/<service_id>/send-email")
@login_required
def send_email(service_id):
return render_template('views/send-email.html', service_id=service_id)
@main.route("/services/<int:service_id>/check-email")
@main.route("/services/<service_id>/check-email")
@login_required
def check_email(service_id):
return render_template('views/check-email.html')
@main.route("/services/<int:service_id>/manage-users")
@main.route("/services/<service_id>/manage-users")
@login_required
def manage_users(service_id):
return render_template('views/manage-users.html', service_id=service_id)

6
app/main/views/jobs.py
View File

@@ -15,7 +15,7 @@ from app.main import main
now = time.strftime('%H:%M')
@main.route("/services/<int:service_id>/jobs")
@main.route("/services/<service_id>/jobs")
@login_required
def view_jobs(service_id):
try:
@@ -32,7 +32,7 @@ def view_jobs(service_id):
raise e
@main.route("/services/<int:service_id>/jobs/<job_id>")
@main.route("/services/<service_id>/jobs/<job_id>")
@login_required
def view_job(service_id, job_id):
try:
@@ -64,7 +64,7 @@ def view_job(service_id, job_id):
raise e
@main.route("/services/<int:service_id>/jobs/<job_id>/notification/<string:notification_id>")
@main.route("/services/<service_id>/jobs/<job_id>/notification/<string:notification_id>")
@login_required
def view_notification(service_id, job_id, notification_id):
return render_template(

16
app/main/views/service_settings.py
View File

@@ -10,7 +10,7 @@ from app.main.forms import ConfirmPasswordForm, ServiceNameForm
from client.errors import HTTPError
@main.route("/services/<int:service_id>/service-settings")
@main.route("/services/<service_id>/service-settings")
@login_required
def service_settings(service_id):
try:
@@ -27,7 +27,7 @@ def service_settings(service_id):
)
@main.route("/services/<int:service_id>/service-settings/name", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
@login_required
def service_name_change(service_id):
try:
@@ -51,7 +51,7 @@ def service_name_change(service_id):
service_id=service_id)
@main.route("/services/<int:service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
@login_required
def service_name_change_confirm(service_id):
try:
@@ -80,7 +80,7 @@ def service_name_change_confirm(service_id):
service_id=service_id)
@main.route("/services/<int:service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
@login_required
def service_request_to_go_live(service_id):
try:
@@ -102,7 +102,7 @@ def service_request_to_go_live(service_id):
return redirect(url_for('.service_settings', service_id=service_id))
@main.route("/services/<int:service_id>/service-settings/status", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/status", methods=['GET', 'POST'])
@login_required
def service_status_change(service_id):
try:
@@ -123,7 +123,7 @@ def service_status_change(service_id):
return redirect(url_for('.service_status_change_confirm', service_id=service_id))
@main.route("/services/<int:service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
@login_required
def service_status_change_confirm(service_id):
try:
@@ -151,7 +151,7 @@ def service_status_change_confirm(service_id):
service_id=service_id)
@main.route("/services/<int:service_id>/service-settings/delete", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
@login_required
def service_delete(service_id):
try:
@@ -172,7 +172,7 @@ def service_delete(service_id):
return redirect(url_for('.service_delete_confirm', service_id=service_id))
@main.route("/services/<int:service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
@login_required
def service_delete_confirm(service_id):
try:

4
app/main/views/sms.py
View File

@@ -31,7 +31,7 @@ from app.main.utils import (
)
@main.route("/services/<int:service_id>/sms/send", methods=['GET', 'POST'])
@main.route("/services/<service_id>/sms/send", methods=['GET', 'POST'])
@login_required
def send_sms(service_id):
form = CsvUploadForm()
@@ -67,7 +67,7 @@ def send_sms(service_id):
service_id=service_id)
@main.route("/services/<int:service_id>/sms/check/<upload_id>",
@main.route("/services/<service_id>/sms/check/<upload_id>",
methods=['GET', 'POST'])
@login_required
def check_sms(service_id, upload_id):

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

@@ -9,7 +9,7 @@ from app.main.dao import services_dao as sdao
from client.errors import HTTPError
@main.route("/services/<int:service_id>/templates")
@main.route("/services/<service_id>/templates")
@login_required
def manage_service_templates(service_id):
try:
@@ -25,7 +25,7 @@ def manage_service_templates(service_id):
templates=[tdao.TemplatesBrowsableItem(x) for x in templates])
@main.route("/services/<int:service_id>/templates/add", methods=['GET', 'POST'])
@main.route("/services/<service_id>/templates/add", methods=['GET', 'POST'])
@login_required
def add_service_template(service_id):
try:
@@ -50,7 +50,7 @@ def add_service_template(service_id):
service_id=service_id)
@main.route("/services/<int:service_id>/templates/<int:template_id>", methods=['GET', 'POST'])
@main.route("/services/<service_id>/templates/<int:template_id>", methods=['GET', 'POST'])
@login_required
def edit_service_template(service_id, template_id):
try:
@@ -78,7 +78,7 @@ def edit_service_template(service_id, template_id):
template_id=template_id)
@main.route("/services/<int:service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST'])
@main.route("/services/<service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST'])
@login_required
def delete_service_template(service_id, template_id):
try: