Merge lp:~stylesen/lava-scheduler/multinode into lp:lava-scheduler/multinode

[Senthil Kumaran S]

Fix error while submitting multinode job via UI.

[Neil Williams (codehelp)]

Tested on multinode.validation.linaro.org, approved.

review: Approve

[lp:~stylesen/lava-scheduler/multinode]

263. By Neil Williams on 2013-07-04

Senthil Kumaran 2013-07-04 Fix error while submitting multinode job via UI.

=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_submit.html'
--- lava_scheduler_app/templates/lava_scheduler_app/job_submit.html	2013-06-28 09:43:44 +0000
+++ lava_scheduler_app/templates/lava_scheduler_app/job_submit.html	2013-07-04 08:56:28 +0000
@@ -31,6 +31,16 @@
 To view the full job list click <a href="{{ list_url }}">here</a>.
 </div>
 
+{% elif job_list %}
+{% url lava.scheduler.job.list as list_url %}
+<div id="job-success">Multinode Job submission successfull!
+<br>
+<br>
+Jobs with ID {{ job_list }}</a> has been created.
+<br>
+To view the full job list click <a href="{{ list_url }}">here</a>.
+</div>
+
 {% else %}
 
 {% if error %}

=== modified file 'lava_scheduler_app/views.py'
--- lava_scheduler_app/views.py	2013-07-04 05:22:29 +0000
+++ lava_scheduler_app/views.py	2013-07-04 08:56:28 +0000
@@ -599,7 +599,10 @@
                 job = TestJob.from_json_and_user(
                        request.POST.get("json-input"), request.user)
 
-                response_data["job_id"] = job.id
+                if isinstance(job, type(list())):
+                    response_data["job_list"] = job
+                else:
+                    response_data["job_id"] = job.id
                 return render_to_response(
                     "lava_scheduler_app/job_submit.html",
                     response_data, RequestContext(request))