External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Dashboard

Browse Source 
Fixed missing search dialog on jobs list.
This commit is contained in:
Chris Houseknecht
2014-06-30 10:12:50 -04:00
parent 87a74f058f
commit 5d1b5624e3
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,6 @@ function JobsListController ($scope, $compile, $routeParams, ClearScope, Breadcr
$scope.removeListLoaded = $scope.$on('listLoaded', function() { $scope.removeListLoaded = $scope.$on('listLoaded', function() {
listCount++; listCount++;
if (listCount === expecting) { if (listCount === expecting) {
//console.log('checking for more events...');
$scope.$emit('ProcessQueue'); $scope.$emit('ProcessQueue');
} }
}); });
@@ -109,11 +108,6 @@ function JobsListController ($scope, $compile, $routeParams, ClearScope, Breadcr
LoadBreadCrumbs(); LoadBreadCrumbs();
// Add breadcrumbs
//e = angular.element(document.getElementById('breadcrumbs'));
//e.html(Breadcrumbs({ list: { editTitle: 'Jobs' } , mode: 'edit' }));
//$compile(e)($scope);
if ($scope.removeListLoaded) { if ($scope.removeListLoaded) {
$scope.removeListLoaded(); $scope.removeListLoaded();
} }

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

@@ -84,7 +84,6 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
list = scope.jobs; list = scope.jobs;
} }
job = Find({ list: list, key: 'id', val: id }); job = Find({ list: list, key: 'id', val: id });
console.log('job type: ' + job.type);
if (job.type === 'job') { if (job.type === 'job') {
$location.url('/jobs/' + job.id); $location.url('/jobs/' + job.id);
} }

11
awx/ui/static/js/widgets/DashboardJobs.js
View File

@@ -30,7 +30,14 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
html += "href=\"#scheduled-jobs-tab\" data-toggle=\"tab\">Schedule</a></li>\n"; html += "href=\"#scheduled-jobs-tab\" data-toggle=\"tab\">Schedule</a></li>\n";
html += "</ul>\n"; html += "</ul>\n";
html += "<div class=\"tab-content\">\n"; html += "<div class=\"tab-content\">\n";
html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\"></div>\n"; html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\">\n";
html += "<div class=\"row search-row\">\n";
html += "<div class=\"col-md-4\" id=\"active-jobs-search-container\"></div>\n";
html += "</div>\n"; //row
html += "<div class=\"job-list\" id=\"active-jobs-container\">\n";
html += "<div id=\"active-jobs\" class=\"job-list-target\"></div>\n";
html += "</div>\n"; //list
html += "</div>\n"; //active-jobs-tab
html += "<div class=\"tab-pane\" id=\"scheduled-jobs-tab\"></div>\n"; html += "<div class=\"tab-pane\" id=\"scheduled-jobs-tab\"></div>\n";
html += "</div>\n"; html += "</div>\n";
@@ -61,7 +68,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
parent_scope: scope, parent_scope: scope,
scope: jobs_scope, scope: jobs_scope,
list: JobsList, list: JobsList,
id: 'active-jobs-tab', id: 'active-jobs',
url: GetBasePath('unified_jobs') + '?status__in=running,completed,failed,successful,error,canceled', url: GetBasePath('unified_jobs') + '?status__in=running,completed,failed,successful,error,canceled',
pageSize: max_rows pageSize: max_rows
}); });