Эх сурвалжийг харах

[jobbrowser] Cannot kill running job from Job Browser

Also doing it for the detail page and fixing HUE-596
Romain Rigaux 13 жил өмнө
parent
commit
1da9d2a3d4

+ 3 - 1
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -20,6 +20,7 @@
   import os
   import re
   from desktop.views import commonheader, commonfooter
+  from django.template.defaultfilters import urlencode
 %>
 
 <%def name="task_table(tasks)">
@@ -100,7 +101,8 @@ ${commonheader("Job: " + job.jobId + " - Job Browser", "jobbrowser")}
 
 				% if job.status.lower() == 'running' or job.status.lower() == 'pending':
 		        <h6>Kill Job</h6>
-				<a href="${url('jobbrowser.views.kill_job', jobid=job.jobId)}" title="Kill this job">Kill this job</a>
+                <a href="#" title="Kill this job" onclick="$('#kill-job').submit()">Kill this job</a>
+                <form id="kill-job" action="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" method="POST"></form>
 		        % endif
 
 

+ 9 - 7
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -88,13 +88,15 @@ ${commonheader("Job Browser", "jobbrowser")}
 			<td>${job.priority.lower()}</td>
 			<td>${job.durationFormatted}</td>
 			<td>${job.startTimeFormatted}</td>
-			<td>
-				% if job.status.lower() == 'running' or job.status.lower() == 'pending':
-				% if request.user.is_superuser or request.user.username == job.user:
-				<a href="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" title="Kill this job">Kill</a> -
-				% endif
-				% endif
-				<a href="${url('jobbrowser.views.single_job', jobid=job.jobId)}" title="View this job">View</a></td>
+            <td>
+                <a href="${url('jobbrowser.views.single_job', jobid=job.jobId)}" title="View this job">View</a>
+                % if job.status.lower() == 'running' or job.status.lower() == 'pending':
+                % if request.user.is_superuser or request.user.username == job.user:
+                - <a href="#" title="Kill this job" onclick="$('#kill-job').submit()">Kill</a>
+                <form id="kill-job" action="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" method="POST"></form>
+                % endif
+                % endif
+            </td>
 			</tr>
 			% endfor
 		</tbody>