External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-1242 project dashboard links.

Browse Source
This commit is contained in:
chouseknecht
2014-05-13 00:37:54 -04:00
parent bdf4192138
commit 5823347c52
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -25,6 +25,7 @@ coverage.xml
pep8.txt pep8.txt
.vagrant* .vagrant*
.tox .tox
.tower_cycle
nohup.out nohup.out
reports reports
package.json package.json

4
awx/ui/static/js/controllers/Projects.js
View File

@@ -113,7 +113,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
var opt; var opt;
list.fields.scm_type.searchOptions = $scope.project_scm_type_options; 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) { if ($routeParams.scm_type && $routeParams.status) {
// Request coming from home page. User wants all errors for an scm_type // 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) { if ($routeParams.scm_type) {
$scope[list.iterator + 'SearchType'] = '';
$scope[list.iterator + 'SearchField'] = 'scm_type'; $scope[list.iterator + 'SearchField'] = 'scm_type';
$scope[list.iterator + 'SelectShow'] = true; $scope[list.iterator + 'SelectShow'] = true;
$scope[list.iterator + 'SearchSelectOpts'] = list.fields.scm_type.searchOptions; $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) { } else if ($routeParams.status) {
$scope[list.iterator + 'SearchType'] = '';
$scope[list.iterator + 'SearchValue'] = $routeParams.status; $scope[list.iterator + 'SearchValue'] = $routeParams.status;
$scope[list.iterator + 'SearchField'] = 'status'; $scope[list.iterator + 'SearchField'] = 'status';
$scope[list.iterator + 'SelectShow'] = true; $scope[list.iterator + 'SelectShow'] = true;

4
awx/ui/static/js/lists/Projects.js
View File

@@ -31,7 +31,9 @@ angular.module('ProjectsListDefinition', [])
dataPlacement: 'top', dataPlacement: 'top',
icon: "icon-job-{{ project.statusIcon }}", icon: "icon-job-{{ project.statusIcon }}",
columnClass: "col-lg-1 col-md-1 col-sm-2 col-xs-2", 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: { name: {
key: true, key: true,