diff --git a/awx/ui/client/src/lists/PortalJobTemplates.js b/awx/ui/client/src/lists/PortalJobTemplates.js index 95b806910c..05b744d6de 100644 --- a/awx/ui/client/src/lists/PortalJobTemplates.js +++ b/awx/ui/client/src/lists/PortalJobTemplates.js @@ -11,15 +11,13 @@ export default name: 'job_templates', iterator: 'job_template', - // selectTitle: 'Add Job Template', editTitle: 'Job Templates', listTitle: 'Job Templates', - // selectInstructions: "Click on a row to select it, and click Finished when done. Use the " + - // "button to create a new job template.", index: false, hover: true, well: true, - + searchSize: 'col-lg-8 col-md-8 col-sm-12 col-xs-12', + fields: { name: { key: true, diff --git a/awx/ui/client/src/lists/PortalJobs.js b/awx/ui/client/src/lists/PortalJobs.js index 776f9ac741..e16bd11ad3 100644 --- a/awx/ui/client/src/lists/PortalJobs.js +++ b/awx/ui/client/src/lists/PortalJobs.js @@ -16,6 +16,7 @@ export default hover: true, well: true, listTitle: 'Jobs', + searchSize: 'col-lg-8 col-md-8 col-sm-12 col-xs-12', fields: { status: { @@ -27,23 +28,9 @@ export default searchable: true, nosort: true, searchType: 'select', - searchOptions: [ - { name: "Success", value: "successful" }, - { name: "Error", value: "error" }, - { name: "Failed", value: "failed" }, - { name: "Canceled", value: "canceled" } - ] + searchOptions: [], + searchLabel: 'Status' }, - /* - id: { - label: 'ID', - key: true, - noLink: true, //undocumented: 'key' above will automatically made the fields a link, but 'noLink' will override this setting - desc: true, - searchType: 'int', - columnClass: 'col-xs-2 List-staticColumnAdjacent', - }, - */ name: { key: true, label: 'Name', diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js index 74fff32954..7da2a7b0a6 100644 --- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js +++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js @@ -21,7 +21,6 @@ export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath id: 'portal-jobs', mode: 'edit', scope: $scope, - searchSize: 'col-md-10 col-xs-12' }); SearchInit({ @@ -54,6 +53,7 @@ export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath }; init(); + console.log($scope) } PortalModeJobsController.$inject = ['$scope', '$state', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit', diff --git a/awx/ui/client/src/search/tagSearch.controller.js b/awx/ui/client/src/search/tagSearch.controller.js index 8edcfdce12..21121a648a 100644 --- a/awx/ui/client/src/search/tagSearch.controller.js +++ b/awx/ui/client/src/search/tagSearch.controller.js @@ -2,7 +2,8 @@ export default ['$scope', 'Refresh', 'tagSearchService', function($scope, Refresh, tagSearchService) { // JSONify passed field elements that can be searched $scope.list = JSON.parse($scope.list); - + // Access config lines from list spec + $scope.listConfig = $scope.$parent.list; // Grab options for the left-dropdown of the searchbar tagSearchService.getSearchTypes($scope.list, $scope.endpoint) .then(function(searchTypes) { diff --git a/awx/ui/client/src/search/tagSearch.partial.html b/awx/ui/client/src/search/tagSearch.partial.html index de379cf3d9..5609adc229 100644 --- a/awx/ui/client/src/search/tagSearch.partial.html +++ b/awx/ui/client/src/search/tagSearch.partial.html @@ -1,5 +1,5 @@