Added current_service to flask context and template context.

Fix all tests and conflicts.

Removed comment line.

app/main/views/send.py

@@ -25,8 +25,8 @@ from app.main.uploader import (
     s3upload,
     s3download
 )
-from app import (job_api_client, service_api_client)
-from app.utils import user_has_permissions, get_errors_for_csv
+from app import (job_api_client, service_api_client, current_service)
+from app.utils import (user_has_permissions, get_errors_for_csv)
 
 
 def get_send_button_text(template_type, number_of_messages):
@@ -72,9 +72,6 @@ def get_example_csv_rows(template, number_of_rows=2):
                       'manage_api_keys',
                       admin_override=True, any_=True)
 def choose_template(service_id, template_type):
-
-    service = service_api_client.get_service(service_id)['data']
-
     if template_type not in ['email', 'sms']:
         abort(404)
 
@@ -83,14 +80,12 @@ def choose_template(service_id, template_type):
         templates=[
             Template(
                 template,
-                prefix=service['name']
+                prefix=current_service['name']
             ) for template in service_api_client.get_service_templates(service_id)['data']
             if template['template_type'] == template_type
         ],
         template_type=template_type,
-        page_heading=get_page_headings(template_type),
-        service=service,
-        service_id=service_id
+        page_heading=get_page_headings(template_type)
     )
 
 
@@ -98,11 +93,9 @@ def choose_template(service_id, template_type):
 @login_required
 @user_has_permissions('send_texts', 'send_emails', 'send_letters')
 def send_messages(service_id, template_id):
-
-    service = service_api_client.get_service(service_id)['data']
     template = Template(
         service_api_client.get_service_template(service_id, template_id)['data'],
-        prefix=service['name']
+        prefix=current_service['name']
     )
 
     form = CsvUploadForm()
@@ -136,9 +129,7 @@ def send_messages(service_id, template_id):
         template=template,
         recipient_column=first_column_heading[template.template_type],
         example=get_example_csv_rows(template),
-        form=form,
-        service=service,
-        service_id=service_id
+        form=form
     )
 
 
@@ -179,8 +170,8 @@ def send_message_to_self(service_id, template_id):
     session['upload_data'] = {"template_id": template_id, "original_file_name": filedata['file_name']}
 
     return redirect(url_for('.check_messages',
-                            service_id=service_id,
                             upload_id=upload_id,
+                            service_id=service_id,
                             template_type=template.template_type))
 
 
@@ -201,8 +192,7 @@ def send_from_api(service_id, template_id):
     return render_template(
         'views/send-from-api.html',
         template=template,
-        payload=json.dumps(payload, indent=4),
-        service_id=service_id
+        payload=json.dumps(payload, indent=4)
     )
 
 
@@ -214,8 +204,6 @@ def check_messages(service_id, template_type, upload_id):
     if not session.get('upload_data'):
         return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
 
-    service = service_api_client.get_service(service_id)['data']
-
     contents = s3download(service_id, upload_id)
     if not contents:
         flash('There was a problem reading your upload file')
@@ -227,7 +215,7 @@ def check_messages(service_id, template_type, upload_id):
 
     template = Template(
         template,
-        prefix=service['name']
+        prefix=current_service['name']
     )
 
     recipients = RecipientCSV(
@@ -259,8 +247,6 @@ def check_messages(service_id, template_type, upload_id):
         ),
         original_file_name=session['upload_data'].get('original_file_name'),
         send_button_text=get_send_button_text(template.template_type, session['upload_data']['notification_count']),
-        service_id=service_id,
-        service=service,
         upload_id=upload_id,
         form=CsvUploadForm()
     )
@@ -272,7 +258,6 @@ def check_messages(service_id, template_type, upload_id):
 def start_job(service_id, upload_id):
 
     upload_data = session['upload_data']
-    service = service_api_client.get_service(service_id)['data']
 
     if request.files or not upload_data.get('valid'):
         # The csv was invalid, validate the csv again
@@ -289,5 +274,5 @@ def start_job(service_id, upload_id):
     )
 
     return redirect(
-        url_for('main.view_job', service_id=service_id, job_id=upload_id)
+        url_for('main.view_job', job_id=upload_id, service_id=service_id)
     )