External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed Type and Name columns in Scheduled list on Jobs page. Fixed Name link in completed jobs list on Jobs page.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-04-01 18:30:04 -04:00
parent 5ea4a68820
commit 4d6ce4b5fa
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/static/js/helpers/Jobs.js
View File

@@ -73,7 +73,8 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
scope.viewJobLog = function(id, url) { scope.viewJobLog = function(id, url) {
var list, job; var list, job;
if (url) { if (url) {
$location.path(url); console.log(url);
$location.url(url);
} }
else { else {
if (scope.completed_jobs) { if (scope.completed_jobs) {
@@ -303,7 +304,7 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
Rest.setUrl(item.related.inventory_source); Rest.setUrl(item.related.inventory_source);
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {
itm.nameHref = "/inventories/" + data.inventory; itm.nameHref = "/home/groups?id=" + data.group;
}); });
} }
else if (item.type === "project_update") { else if (item.type === "project_update") {

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

@@ -503,6 +503,8 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
itm.status_tip = 'Schedule is temporarily stopped. Click to activate.'; itm.status_tip = 'Schedule is temporarily stopped. Click to activate.';
} }
itm.nameTip = item.name + " schedule. Click to edit.";
// Copy summary_field values // Copy summary_field values
for (field in list.fields) { for (field in list.fields) {
fld = list.fields[field]; fld = list.fields[field];

8
awx/ui/static/js/lists/ScheduledJobs.js
View File

@@ -45,7 +45,7 @@ angular.module('ScheduledJobsDefinition', [])
link: false, link: false,
columnClass: "col-md-2 hidden-sm hidden-xs", columnClass: "col-md-2 hidden-sm hidden-xs",
sourceModel: 'unified_job_template', sourceModel: 'unified_job_template',
sourceField: 'type', sourceField: 'job_type',
ngBind: 'schedule.type_label', ngBind: 'schedule.type_label',
searchable: false, searchable: false,
nosort: true nosort: true
@@ -53,7 +53,11 @@ angular.module('ScheduledJobsDefinition', [])
name: { name: {
label: 'Name', label: 'Name',
columnClass: "col-md-3 col-xs-5", 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"
} }
}, },

7
awx/ui/static/less/ansible-ui.less
View File

@@ -1055,12 +1055,15 @@ input[type="checkbox"].checkbox-no-label {
color: #666; color: #666;
} }
.pagination li a { .pagination li a {
font-size: 12px; font-size: 13px;
} }
i[class*="icon-job-"] { 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 */ /* Inventory job status badge */
.failures-true { .failures-true {