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

Merge pull request #6700 from mabashian/6699-credential_type-tag

Browse Source 
Added credential_type as a default search param to projects credential
This commit is contained in:
Michael Abashian
2017-06-23 12:54:39 -04:00
committed by GitHub
parent badb7441ae e401bb8986
commit d770156640
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/projects/projects.form.js
View File

@@ -130,10 +130,9 @@ export default ['i18n', 'NotificationsList', function(i18n, NotificationsList) {
type: 'lookup', type: 'lookup',
basePath: 'credentials', basePath: 'credentials',
list: 'CredentialList', list: 'CredentialList',
// apply a default search filter to show only scm credentials search: {
// search: { credential_type: null
// kind: 'scm' },
// },
ngClick: 'lookupCredential()', ngClick: 'lookupCredential()',
awRequiredWhen: { awRequiredWhen: {
reqExpression: "credRequired", reqExpression: "credRequired",

2
awx/ui/client/src/shared/directives.js
View File

@@ -533,7 +533,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
} }
else { else {
basePath = GetBasePath(elm.attr('data-basePath')) || elm.attr('data-basePath'); basePath = GetBasePath(elm.attr('data-basePath')) || elm.attr('data-basePath');
let switchType = attrs.awlookuptype ? attrs.awlookuptype : modelName;console.log(switchType); let switchType = attrs.awlookuptype ? attrs.awlookuptype : modelName;
switch(switchType) { switch(switchType) {
case 'credential': case 'credential':