From 5823347c527dcd40858bfcff860e4926d209c24a Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 13 May 2014 00:37:54 -0400 Subject: [PATCH] AC-1242 project dashboard links. --- .gitignore | 1 + awx/ui/static/js/controllers/Projects.js | 4 +++- awx/ui/static/js/lists/Projects.js | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33e6970b44..981bf70e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ coverage.xml pep8.txt .vagrant* .tox +.tower_cycle nohup.out reports package.json diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js index d2299d9da1..1c74084776 100644 --- a/awx/ui/static/js/controllers/Projects.js +++ b/awx/ui/static/js/controllers/Projects.js @@ -113,7 +113,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest, var opt; list.fields.scm_type.searchOptions = $scope.project_scm_type_options; - //list.fields.status.searchOptions = $scope.project_status_options; + list.fields.status.searchOptions = $scope.project_status_options; if ($routeParams.scm_type && $routeParams.status) { // Request coming from home page. User wants all errors for an scm_type @@ -133,6 +133,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest, }); if ($routeParams.scm_type) { + $scope[list.iterator + 'SearchType'] = ''; $scope[list.iterator + 'SearchField'] = 'scm_type'; $scope[list.iterator + 'SelectShow'] = true; $scope[list.iterator + 'SearchSelectOpts'] = list.fields.scm_type.searchOptions; @@ -144,6 +145,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest, } } } else if ($routeParams.status) { + $scope[list.iterator + 'SearchType'] = ''; $scope[list.iterator + 'SearchValue'] = $routeParams.status; $scope[list.iterator + 'SearchField'] = 'status'; $scope[list.iterator + 'SelectShow'] = true; diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index f5a4995591..0a23e8fa53 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -31,7 +31,9 @@ angular.module('ProjectsListDefinition', []) dataPlacement: 'top', icon: "icon-job-{{ project.statusIcon }}", columnClass: "col-lg-1 col-md-1 col-sm-2 col-xs-2", - nosort: true + nosort: true, + searchType: 'select', + searchOptions: [] //set in the controller }, name: { key: true,