zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 18:18:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

First iteration of Activity Stream. Added Home/Groups page. Increased icon size for icon-only buttons. Dashboard jobs widget- group and job links now work. Closed AC-621, AC-618.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-08 17:58:19 +00:00
parent 2c4d583f3e
commit 5a3977495a
25 changed files with 1204 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/static/js/controllers/Credentials.js
+10 -2
View File
@@ -227,6 +227,9 @@ function CredentialsAdd ($scope, $rootScope, $compile, $location, $log, $routePa
data['username'] = scope['access_key'];
data['password'] = scope['secret_key'];
break;
case 'scm':
data['ssh_key_unlock'] = scope['scm_key_unlock'];
break;
}
if (Empty(data.team) && Empty(data.user)) {
@@ -415,7 +418,10 @@ function CredentialsEdit ($scope, $rootScope, $compile, $location, $log, $routeP
scope['ssh_password'] = data.password;
master['ssh_username'] = scope['ssh_username'];
master['ssh_password'] = scope['ssh_password'];
break;
break;
case 'scm':
scope['scm_key_unlock'] = data['ssh_key_unlock'];
break;
}
scope.$emit('credentialLoaded');
@@ -451,7 +457,6 @@ function CredentialsEdit ($scope, $rootScope, $compile, $location, $log, $routeP
}
}
if (!Empty(scope.team)) {
data.team = scope.team;
data.user = "";
@@ -472,6 +477,9 @@ function CredentialsEdit ($scope, $rootScope, $compile, $location, $log, $routeP
data['username'] = scope['access_key'];
data['password'] = scope['secret_key'];
break;
case 'scm':
data['ssh_key_unlock'] = scope['scm_key_unlock'];
break;
}
if (Empty(data.team) && Empty(data.user)) {