External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 21:20:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from jlmitch5/form

Browse Source 
showing ASK when ask for password is selected
This commit is contained in:
jlmitch5
2015-03-09 20:56:52 -04:00
parent c560ff2107 26e2c7b8dc
commit e1aa3bf6b3
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/static/js/controllers/Credentials.js
View File

@@ -261,13 +261,21 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log, $r
$scope.ask = function (fld, associated) { $scope.ask = function (fld, associated) {
if ($scope[fld + '_ask']) { if ($scope[fld + '_ask']) {
$scope[fld] = 'ASK'; $scope[fld] = 'ASK';
$("#" + form.name + "_" + fld + "_input").attr("type", "text");
$("#" + form.name + "_" + fld + "_show_input_button").html("<i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i>");
if (associated !== "undefined") { if (associated !== "undefined") {
$("#" + form.name + "_" + fld + "_input").attr("type", "password");
$("#" + form.name + "_" + fld + "_show_input_button").html("ABC");
$scope[associated] = ''; $scope[associated] = '';
$scope[form.name + '_form'][associated].$setValidity('awpassmatch', true); $scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
} }
} else { } else {
$scope[fld] = ''; $scope[fld] = '';
$("#" + form.name + "_" + fld + "_input").attr("type", "password");
$("#" + form.name + "_" + fld + "_show_input_button").html("ABC");
if (associated !== "undefined") { if (associated !== "undefined") {
$("#" + form.name + "_" + fld + "_input").attr("type", "text");
$("#" + form.name + "_" + fld + "_show_input_button").html("<i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i>");
$scope[associated] = ''; $scope[associated] = '';
$scope[form.name + '_form'][associated].$setValidity('awpassmatch', true); $scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
} }
@@ -312,6 +320,8 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log, $
for (fld in form.fields) { for (fld in form.fields) {
if (form.fields[fld].type === 'sensitive' && $scope[fld] === 'ASK') { if (form.fields[fld].type === 'sensitive' && $scope[fld] === 'ASK') {
// turn on 'ask' checkbox for password fields with value of 'ASK' // turn on 'ask' checkbox for password fields with value of 'ASK'
$("#" + form.name + "_" + fld + "_input").attr("type", "text");
$("#" + form.name + "_" + fld + "_show_input_button").html("<i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i>");
$("#" + fld + "-clear-btn").attr("disabled", "disabled"); $("#" + fld + "-clear-btn").attr("disabled", "disabled");
$scope[fld + '_ask'] = true; $scope[fld + '_ask'] = true;
} else { } else {
@@ -551,13 +561,21 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log, $
$scope.ask = function (fld, associated) { $scope.ask = function (fld, associated) {
if ($scope[fld + '_ask']) { if ($scope[fld + '_ask']) {
$scope[fld] = 'ASK'; $scope[fld] = 'ASK';
$("#" + form.name + "_" + fld + "_input").attr("type", "text");
$("#" + form.name + "_" + fld + "_show_input_button").html("<i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i>");
if (associated !== "undefined") { if (associated !== "undefined") {
$("#" + form.name + "_" + fld + "_input").attr("type", "password");
$("#" + form.name + "_" + fld + "_show_input_button").html("ABC");
$scope[associated] = ''; $scope[associated] = '';
$scope[form.name + '_form'][associated].$setValidity('awpassmatch', true); $scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
} }
} else { } else {
$scope[fld] = ''; $scope[fld] = '';
$("#" + form.name + "_" + fld + "_input").attr("type", "password");
$("#" + form.name + "_" + fld + "_show_input_button").html("ABC");
if (associated !== "undefined") { if (associated !== "undefined") {
$("#" + form.name + "_" + fld + "_input").attr("type", "text");
$("#" + form.name + "_" + fld + "_show_input_button").html("<i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i><i class=\"fa fa-asterisk\"></i>");
$scope[associated] = ''; $scope[associated] = '';
$scope[form.name + '_form'][associated].$setValidity('awpassmatch', true); $scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
} }