Merge branch '2947' into release_3.0.0

This commit is contained in:
Leigh Johnson 2016-07-12 17:38:29 -04:00
commit abe911108d
2 changed files with 3 additions and 0 deletions

View File

@ -162,6 +162,8 @@ angular.module('JobTemplatesHelper', ['Utilities'])
input_type: "radio"
});
CredentialList.basePath = GetBasePath('credentials') + '?kind=ssh';
LookUpInit({
url: GetBasePath('credentials') + '?kind=ssh',
scope: scope,

View File

@ -331,6 +331,7 @@ export default
var credential_url = GetBasePath('credentials') + '?kind=ssh';
var credList = _.cloneDeep(CredentialList);
credList.basePath = GetBasePath('credentials') + '?kind=ssh';
credList.fields.description.searchable = false;
credList.fields.kind.searchable = false;