Added current_service to flask context and template context.

Fix all tests and conflicts.

Removed comment line.

app/main/views/service_settings.py

@@ -18,27 +18,20 @@ from app.main import main
 from app.utils import user_has_permissions, email_safe
 from app.main.forms import ConfirmPasswordForm, ServiceNameForm
 from app import user_api_client
+from app import current_service
 
 
 @main.route("/services/<service_id>/service-settings")
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_settings(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
-    return render_template(
-        'views/service-settings.html',
-        service=service,
-        service_id=service_id
-    )
+    return render_template('views/service-settings.html')
 
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_name_change(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
     form = ServiceNameForm(service_api_client.find_all_service_email_from)
 
     if form.validate_on_submit():
@@ -47,16 +40,13 @@ def service_name_change(service_id):
 
     return render_template(
         'views/service-settings/name.html',
-        service=service,
-        form=form,
-        service_id=service_id)
+        form=form)
 
 
 @main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_name_change_confirm(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     # Validate password for form
     def _check_password(pwd):
@@ -64,17 +54,17 @@ def service_name_change_confirm(service_id):
     form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
-        service['name'] = session['service_name_change']
-        service['email_from'] = email_safe(session['service_name_change'])
+        current_service['name'] = session['service_name_change']
+        current_service['email_from'] = email_safe(session['service_name_change'])
         try:
             service_api_client.update_service(
-                service['id'],
-                service['name'],
-                service['active'],
-                service['limit'],
-                service['restricted'],
-                service['users'],
-                service['email_from'])
+                current_service['id'],
+                current_service['name'],
+                current_service['active'],
+                current_service['limit'],
+                current_service['restricted'],
+                current_service['users'],
+                current_service['email_from'])
         except HTTPError as e:
             error_msg = "Duplicate service name '{}'".format(session['service_name_change'])
             if e.status_code == 400 and error_msg in e.message['name']:
@@ -84,26 +74,21 @@ def service_name_change_confirm(service_id):
             else:
                 raise e
         else:
-            session['service_name'] = service['name']
             session.pop('service_name_change')
             return redirect(url_for('.service_settings', service_id=service_id))
     return render_template(
         'views/service-settings/confirm.html',
         heading='Change your service name',
-        form=form,
-        service_id=service_id)
+        form=form)
 
 
 @main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_request_to_go_live(service_id):
-    service = service_api_client.get_service(service_id)['data']
     if request.method == 'GET':
         return render_template(
-            'views/service-settings/request-to-go-live.html',
-            service=service,
-            service_id=service_id
+            'views/service-settings/request-to-go-live.html'
         )
     elif request.method == 'POST':
         flash('Thanks your request to go live is being processed', 'default')
@@ -115,13 +100,9 @@ def service_request_to_go_live(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_status_change(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
     if request.method == 'GET':
         return render_template(
-            'views/service-settings/status.html',
-            service=service,
-            service_id=service_id
+            'views/service-settings/status.html'
         )
     elif request.method == 'POST':
         return redirect(url_for('.service_status_change_confirm', service_id=service_id))
@@ -131,43 +112,37 @@ def service_status_change(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_status_change_confirm(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
     # Validate password for form
     def _check_password(pwd):
         return user_api_client.verify_password(current_user.id, pwd)
     form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
-        service['active'] = True
+        current_service['active'] = True
         service_api_client.update_service(
-            service['id'],
-            service['name'],
-            service['active'],
-            service['limit'],
-            service['restricted'],
-            service['users'],
-            service['email_from'])
+            current_service['id'],
+            current_service['name'],
+            current_service['active'],
+            current_service['limit'],
+            current_service['restricted'],
+            current_service['users'],
+            current_service['email_from'])
         return redirect(url_for('.service_settings', service_id=service_id))
     return render_template(
         'views/service-settings/confirm.html',
         heading='Turn off all outgoing notifications',
         destructive=True,
-        form=form,
-        service_id=service_id)
+        form=form)
 
 
 @main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_delete(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     if request.method == 'GET':
         return render_template(
-            'views/service-settings/delete.html',
-            service=service,
-            service_id=service_id
+            'views/service-settings/delete.html'
         )
     elif request.method == 'POST':
         return redirect(url_for('.service_delete_confirm', service_id=service_id))
@@ -177,7 +152,6 @@ def service_delete(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_delete_confirm(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     # Validate password for form
     def _check_password(pwd):
@@ -185,12 +159,11 @@ def service_delete_confirm(service_id):
     form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
-        service = service_api_client.delete_service(service_id)
+        service_api_client.delete_service(service_id)
         return redirect(url_for('.choose_service'))
 
     return render_template(
         'views/service-settings/confirm.html',
         heading='Delete this service from Notify',
         destructive=True,
-        form=form,
-        service_id=service_id)
+        form=form)