External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 06:26:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-1016 on host status fly-out job id now links to job detail page rather than showing modal dialog. Fixed js errors happening when job_template is deleted and cannot be found.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-02-06 17:36:51 -05:00
parent c55d3e935b
commit 4e49314bad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/controllers/Jobs.js
View File

@@ -255,7 +255,7 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
check_field: 'allow_callbacks', check_field: 'allow_callbacks',
default_val: dft default_val: dft
}); });
scope.callback_url = data.related.callback; scope.callback_url = (data.related) ? data.related.callback : '<< Job template not found >>';
scope.$emit('jobTemplateLoadFinished'); scope.$emit('jobTemplateLoadFinished');
}) })
.error( function() { .error( function() {
@@ -340,7 +340,7 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
} }
scope.id = data.id; scope.id = data.id;
scope.name = data.summary_fields.job_template.name; scope.name = (data.summary_fields && data.summary_fields.job_template) ? data.summary_fields.job_template.name : '';
if (fld === 'variables') { if (fld === 'variables') {
// Parse extra_vars, converting to YAML. // Parse extra_vars, converting to YAML.

2
awx/ui/static/js/helpers/Hosts.js
View File

@@ -99,7 +99,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
for (j=0; j < jobs.length; j++) { for (j=0; j < jobs.length; j++) {
job = jobs[j]; job = jobs[j];
html += "<tr>\n"; html += "<tr>\n";
html += "<td><a ng-click=\"showJobSummary(" + job.id + ")\">" + job.id + "</a></td>\n"; html += "<td><a href=\"/#/jobs/" + job.id + "\">" + job.id + "</a></td>\n";
html += "<td class=\"text-center\"><a ng-click=\"showJobSummary(" + job.id + ")\"><i class=\"fa icon-job-" + html += "<td class=\"text-center\"><a ng-click=\"showJobSummary(" + job.id + ")\"><i class=\"fa icon-job-" +
job.status + "\"></i></a></td>\n"; job.status + "\"></i></a></td>\n";
html += "<td><a href=\"/#/jobs/" + job.id + "/job_events/?host=" + encodeURI(host.name) + "\">Events</a> " + html += "<td><a href=\"/#/jobs/" + job.id + "/job_events/?host=" + encodeURI(host.name) + "\">Events</a> " +