From 81ead8c85d6452d7dd821b749d6e90070e4bdf26 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 16 Feb 2015 12:11:11 -0500 Subject: [PATCH] Changed labels for filters on portal mode changed the labels to make things more aligned to the semantics of the actual filter. --- awx/ui/static/js/widgets/PortalJobs.js | 8 ++++---- awx/ui/static/partials/portal.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/ui/static/js/widgets/PortalJobs.js b/awx/ui/static/js/widgets/PortalJobs.js index 4a4c66d7f7..ffd8005aba 100644 --- a/awx/ui/static/js/widgets/PortalJobs.js +++ b/awx/ui/static/js/widgets/PortalJobs.js @@ -45,7 +45,7 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities']) PortalJobsList.fields.type.searchOptions = scope.type_choices; } user = scope.$parent.current_user.id; - url = (filter === "Team" ) ? GetBasePath('jobs') : GetBasePath('jobs')+'?created_by='+user ; + url = (filter === "All Jobs" ) ? GetBasePath('jobs') : GetBasePath('jobs')+'?created_by='+user ; LoadJobsScope({ parent_scope: scope, scope: jobs_scope, @@ -77,7 +77,7 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities']) $("#active-jobs").empty(); $("#active-jobs-search-container").empty(); user = scope.$parent.current_user.id; - url = (filter === "Team" ) ? GetBasePath('jobs') : GetBasePath('jobs')+'?created_by='+user ; + url = (filter === "All Jobs" ) ? GetBasePath('jobs') : GetBasePath('jobs')+'?created_by='+user ; LoadJobsScope({ parent_scope: scope, scope: jobs_scope, @@ -96,8 +96,8 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities']) html += "
\n"; html += "
" ; html += "
" ; - html += " " ; - html += "" ; + html += "" ; + html += "" ; html += "
" ; html += "
" ; html += "\n"; //row diff --git a/awx/ui/static/partials/portal.html b/awx/ui/static/partials/portal.html index 5c94a97337..604d36bacf 100644 --- a/awx/ui/static/partials/portal.html +++ b/awx/ui/static/partials/portal.html @@ -16,7 +16,7 @@
- My Jobs + Jobs