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

AC-420 unshifted shifted columns

Browse Source
This commit is contained in:
chouseknecht
2013-09-06 17:49:19 -04:00
parent f8e1d2e0e3
commit 216c488ce7
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/static/js/controllers/JobHosts.js
View File

@@ -18,6 +18,15 @@ function JobHostSummaryList ($scope, $rootScope, $location, $log, $routeParams,
var list = JobHostList; var list = JobHostList;
var base = $location.path().replace(/^\//,'').split('/')[0]; var base = $location.path().replace(/^\//,'').split('/')[0];
var defaultUrl = GetBasePath(base) + $routeParams.id + '/job_host_summaries/'; var defaultUrl = GetBasePath(base) + $routeParams.id + '/job_host_summaries/';
// When viewing all summaries for a particular host, show job ID, otherwise row ID.
if (base == 'hosts') {
list.index = false;
}
else {
list.index = true;
}
var view = GenerateList; var view = GenerateList;
var scope = view.inject(list, { mode: 'edit' }); var scope = view.inject(list, { mode: 'edit' });
scope.selected = []; scope.selected = [];

2
awx/ui/static/js/forms/InventoryHosts.js
View File

@@ -35,7 +35,7 @@ angular.module('InventoryHostsFormDefinition', [])
type: 'DropDown', type: 'DropDown',
searchable: false, searchable: false,
nosort: true, nosort: true,
label: 'View', label: 'Jobs',
"class": "btn-sm", "class": "btn-sm",
//ngDisabled: 'host.last_job == null', //ngDisabled: 'host.last_job == null',
options: [ options: [

2
awx/ui/static/js/lists/JobHosts.js
View File

@@ -13,7 +13,7 @@ angular.module('JobHostDefinition', [])
name: 'jobhosts', name: 'jobhosts',
iterator: 'jobhost', iterator: 'jobhost',
editTitle: 'Job Host Summary', editTitle: 'Job Host Summary',
indexShow: 'host_id == null', index: true,
hover: true, hover: true,
fields: { fields: {

4
awx/ui/static/lib/ansible/generator-helpers.js
View File

@@ -59,6 +59,9 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
case 'dataTitle': case 'dataTitle':
result = "data-title=\"" + value + "\" "; result = "data-title=\"" + value + "\" ";
break; break;
case 'columnShow':
result = "ng-show=\"" + value + "\" ";
break;
case 'dataPlacement': case 'dataPlacement':
result = "data-placement=\"" + value + "\" "; result = "data-placement=\"" + value + "\" ";
break; break;
@@ -183,6 +186,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += "\" "; html += "\" ";
html += (field.ngClass) ? Attr(field, 'ngClass') : ""; html += (field.ngClass) ? Attr(field, 'ngClass') : "";
html += (options.mode == 'lookup' || options.mode == 'select') ? " ng-click=\"toggle_" + list.iterator +"({{ " + list.iterator + ".id }})\"" : ""; html += (options.mode == 'lookup' || options.mode == 'select') ? " ng-click=\"toggle_" + list.iterator +"({{ " + list.iterator + ".id }})\"" : "";
html += (field.columnShow) ? Attr(field, 'columnShow') : "";
html += ">\n"; html += ">\n";
// Add ngShow // Add ngShow