zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-21 07:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

merge downstream branch

Browse Source
This commit is contained in:
Ryan Petrello
2019-11-25 10:05:05 -05:00
parent 2cb5b0563b 17509d560d
commit 78d715efed
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/license/license.controller.js
View File

@@ -187,10 +187,6 @@ export default
payload = $scope.newLicense.file;
} else if ($scope.selectedLicense.fullLicense) {
payload = $scope.selectedLicense.fullLicense;
if ($scope.rhCreds.username && $scope.rhCreds.password) {
payload.rh_password = $scope.rhCreds.password;
payload.rh_username = $scope.rhCreds.username;
}
}
CheckLicense.post(payload, $scope.newLicense.eula)