Merge pull request #976 from ZitaNemeckova/credential_fix

Use textarea for ssh key in Machine Credentials
ManageIQ · Apr 20, 2017 · 554c1d7 · 554c1d7
2 parents 287dc37 + 2d3a0f1
commit 554c1d7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/assets/javascripts/components/ansible-credential-options.js b/app/assets/javascripts/components/ansible-credential-options.js
@@ -29,9 +29,10 @@ ManageIQ.angular.app.component('ansibleCredentialOptions', {
         '{{ __(attr.label) }}',
        '</label>',
        '<div ng-switch="attr.type" class="text">',
-         // password
+         // password or ssh input (must be textarea to prevent EOL getting lost)
          '<div ng-switch-when="password" class="col-md-8">',
-           '<input type="password" class="form-control" title="{{ __(attr.help_text) }}" ng-model="vm.model[name]">',
+           '<input ng-if="!attr.multiline" type="password" class="form-control" title="{{ __(attr.help_text) }}" ng-model="vm.model[name]">',
+           '<textarea ng-if="attr.multiline" class="form-control" title="{{ __(attr.help_text) }}" ng-model="vm.model[name]"></textarea>',
          '</div>',
          // select
          '<div ng-switch-when="choice" class="col-md-8">',