External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 15:58:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Adding filter on portal jobs for user/team

Browse Source 
Feature request from Bill for the jobs view of portal mode to be filterable for users/teams
This commit is contained in:
Jared Tabor
2015-01-27 14:30:42 -05:00
parent f255f39915
commit 582bca474c
1 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
awx/ui/static/js/widgets/PortalJobs.js
View File

@@ -11,33 +11,19 @@
'use strict'; 'use strict';
angular.module('PortalJobsWidget', ['RestServices', 'Utilities']) angular.module('PortalJobsWidget', ['RestServices', 'Utilities'])
.factory('PortalJobsWidget', ['$rootScope', '$compile', 'LoadSchedulesScope', 'LoadJobsScope', 'PortalJobsList', 'ScheduledJobsList', 'GetChoices', 'GetBasePath', 'PortalJobTemplateList', .factory('PortalJobsWidget', ['$rootScope', '$compile', 'LoadSchedulesScope', 'LoadJobsScope', 'PortalJobsList', 'ScheduledJobsList', 'GetChoices', 'GetBasePath', 'PortalJobTemplateList' ,
function ($rootScope, $compile, LoadSchedulesScope, LoadJobsScope, PortalJobsList, ScheduledJobsList, GetChoices, GetBasePath, PortalJobTemplateList) { function ($rootScope, $compile, LoadSchedulesScope, LoadJobsScope, PortalJobsList, ScheduledJobsList, GetChoices, GetBasePath, PortalJobTemplateList ) {
return function (params) { return function (params) {
var scope = params.scope, var scope = params.scope,
target = params.target, target = params.target,
filter = params.filter || "User" ,
choicesCount = 0, choicesCount = 0,
listCount = 0, listCount = 0,
jobs_scope = scope.$new(true), jobs_scope = scope.$new(true),
max_rows, max_rows,
user, user,
html, e; html, e,
url;
html = '';
html += "<div class=\"portal-job-template-container\">\n";
html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\">\n";
html += "<div class=\"row search-row\" id='portal-job-template-search'>\n";
html += "<div class=\"col-lg-6 col-md-6\" 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>\n";
e = angular.element(document.getElementById(target));
e.html(html);
$compile(e)(scope);
if (scope.removeListLoaded) { if (scope.removeListLoaded) {
scope.removeListLoaded(); scope.removeListLoaded();
@@ -59,18 +45,17 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities'])
PortalJobsList.fields.type.searchOptions = scope.type_choices; PortalJobsList.fields.type.searchOptions = scope.type_choices;
} }
user = scope.$parent.current_user.id; user = scope.$parent.current_user.id;
url = (filter === "Team" ) ? GetBasePath('jobs') : GetBasePath('jobs')+'?created_by='+user ;
LoadJobsScope({ LoadJobsScope({
parent_scope: scope, parent_scope: scope,
scope: jobs_scope, scope: jobs_scope,
list: PortalJobsList, list: PortalJobsList,
id: 'active-jobs', id: 'active-jobs',
url: GetBasePath('jobs')+'?created_by='+user, url: url , //GetBasePath('jobs')+'?created_by='+user,
pageSize: max_rows, pageSize: max_rows,
spinner: true spinner: true
}); });
$(window).resize(_.debounce(function() { $(window).resize(_.debounce(function() {
resizePortalJobsWidget(); resizePortalJobsWidget();
}, 500)); }, 500));
@@ -87,6 +72,47 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities'])
} }
}); });
scope.filterPortalJobs = function(filter) {
$("#active-jobs").empty();
$("#active-jobs-search-container").empty();
user = scope.$parent.current_user.id;
url = (filter === "Team" ) ? GetBasePath('jobs') : GetBasePath('jobs')+'?created_by='+user ;
LoadJobsScope({
parent_scope: scope,
scope: jobs_scope,
list: PortalJobsList,
id: 'active-jobs',
url: url , //GetBasePath('jobs')+'?created_by='+user,
pageSize: max_rows,
spinner: true
});
};
html = '';
html += "<div class=\"portal-job-template-container\">\n";
html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\">\n";
html += "<div class=\"row search-row\" id='portal-job-template-search'>\n";
html += "<div class=\"col-lg-6 col-md-6\" id=\"active-jobs-search-container\"></div>\n";
html += "<div class=\"form-group\">" ;
html += "<div class=\"btn-group\" aw-toggle-button data-after-toggle=\"filterPortalJobs\">" ;
html += " <button class=\"btn btn-xs btn-primary active\">User</button>" ;
html += "<button class=\"btn btn-xs btn-default\">Team</button>" ;
html += "</div>" ;
html += "</div>" ;
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>\n";
e = angular.element(document.getElementById(target));
e.html(html);
$compile(e)(scope);
GetChoices({ GetChoices({
scope: scope, scope: scope,
url: GetBasePath('unified_jobs'), url: GetBasePath('unified_jobs'),