mirror of
https://github.com/ansible/awx.git
synced 2024-11-02 01:21:21 +03:00
Fixed Type and Name columns in Scheduled list on Jobs page. Fixed Name link in completed jobs list on Jobs page.
This commit is contained in:
parent
5ea4a68820
commit
4d6ce4b5fa
@ -73,7 +73,8 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
|
||||
scope.viewJobLog = function(id, url) {
|
||||
var list, job;
|
||||
if (url) {
|
||||
$location.path(url);
|
||||
console.log(url);
|
||||
$location.url(url);
|
||||
}
|
||||
else {
|
||||
if (scope.completed_jobs) {
|
||||
@ -303,7 +304,7 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
|
||||
Rest.setUrl(item.related.inventory_source);
|
||||
Rest.get()
|
||||
.success(function(data) {
|
||||
itm.nameHref = "/inventories/" + data.inventory;
|
||||
itm.nameHref = "/home/groups?id=" + data.group;
|
||||
});
|
||||
}
|
||||
else if (item.type === "project_update") {
|
||||
|
@ -503,6 +503,8 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
|
||||
itm.status_tip = 'Schedule is temporarily stopped. Click to activate.';
|
||||
}
|
||||
|
||||
itm.nameTip = item.name + " schedule. Click to edit.";
|
||||
|
||||
// Copy summary_field values
|
||||
for (field in list.fields) {
|
||||
fld = list.fields[field];
|
||||
|
@ -45,7 +45,7 @@ angular.module('ScheduledJobsDefinition', [])
|
||||
link: false,
|
||||
columnClass: "col-md-2 hidden-sm hidden-xs",
|
||||
sourceModel: 'unified_job_template',
|
||||
sourceField: 'type',
|
||||
sourceField: 'job_type',
|
||||
ngBind: 'schedule.type_label',
|
||||
searchable: false,
|
||||
nosort: true
|
||||
@ -53,7 +53,11 @@ angular.module('ScheduledJobsDefinition', [])
|
||||
name: {
|
||||
label: 'Name',
|
||||
columnClass: "col-md-3 col-xs-5",
|
||||
ngClick: "editSchedule(schedule.id)"
|
||||
sourceModel: 'unified_job_template',
|
||||
sourceField: 'name',
|
||||
ngClick: "editSchedule(schedule.id)",
|
||||
awToolTip: "{{ schedule.nameTip }}",
|
||||
dataPlacement: "top"
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -1055,12 +1055,15 @@ input[type="checkbox"].checkbox-no-label {
|
||||
color: #666;
|
||||
}
|
||||
.pagination li a {
|
||||
font-size: 12px;
|
||||
font-size: 13px;
|
||||
}
|
||||
i[class*="icon-job-"] {
|
||||
font-size: 12.5px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
#completed_jobs_table i[class*="icon-job-"] {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
/* Inventory job status badge */
|
||||
.failures-true {
|
||||
|
Loading…
Reference in New Issue
Block a user