Skip to content

Commit 4fc27de

Browse files
authored
Merge pull request #14879 from jzigmund/bz1441401-central_admin-remove_code_artifacts
[EUWE] Removed code artifact in Central Admin UI
2 parents 5ca3f5c + fe9efae commit 4fc27de

4 files changed

Lines changed: 24 additions & 59 deletions

File tree

app/assets/javascripts/controllers/ops/pglogical_replication_form_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ ManageIQ.angular.app.controller('pglogicalReplicationFormController', ['$http',
346346
animation: $ctrl.animationsEnabled,
347347
ariaLabelledBy: 'modal-title',
348348
ariaDescribedBy: 'modal-body',
349-
templateUrl: 'authkeyModalForm.html',
349+
templateUrl: '/static/authkey_modal_form.html',
350350
controller: 'authkeyModalFormController',
351351
controllerAs: '$ctrl',
352352
resolve: {

app/views/ops/_authkey_modal_form.html.haml

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/views/ops/_settings_replication_tab.html.haml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,6 @@
55
"ng-controller" => "pglogicalReplicationFormController as $ctrl",
66
"ng-show" => "afterGet"}
77
= render :partial => "layouts/flash_msg"
8-
%script{:id => "authkeyModalForm.html", :type => "text/ng-template"}
9-
:cdata
10-
<div class="modal fade" id="authkeyModalForm" tabindex="-1" role="dialog" aria-hidden="true">
11-
<div class="modal-header">
12-
<h4 class="modal-header">SSH Information For An Appliance In the Region</h4>
13-
</div>
14-
<form class="form-horizontal" name="authkeyModalForm" ng-submit="$ctrl.submitForm()" novalidate>
15-
<div class="modal-body">
16-
<div class="form-group">
17-
<label class="col-sm-2 control-label">Host</label>
18-
<div class="col-sm-10">
19-
<input type="text" name="ssh_host" class="form-control" ng-model="$ctrl.ssh_params.ssh_host">
20-
</div>
21-
</div>
22-
<div class="form-group">
23-
<label class="col-sm-2 control-label">User</label>
24-
<div class="col-sm-10">
25-
<input type="text" name="ssh_user" class="form-control" ng-model="$ctrl.ssh_params.ssh_user" required>
26-
<p ng-show="authkeyModalForm.ssh_user.$invalid && !authkeyModalForm.ssh_user.$pristine" class="help-block">SSH user is required.</p>
27-
</div>
28-
</div>
29-
<div class="form-group">
30-
<label class="col-sm-2 control-label">Password</label>
31-
<div class="col-sm-10">
32-
<input type="password" name="ssh_password" class="form-control" ng-model="$ctrl.ssh_params.ssh_password" required>
33-
<p ng-show="authkeyModalForm.ssh_password.$invalid && !authkeyModalForm.ssh_password.$pristine" class="help-block">SSH password is required.</p>
34-
</div>
35-
</div>
36-
</div>
37-
<div class="modal-footer">
38-
<button type="submit" class="btn btn-primary" ng-disabled="authkeyModalForm.$invalid">Submit</button>
39-
<button class="btn btn-default" ng-click="$ctrl.cancelForm()">Cancel</button>
40-
</div>
41-
</form>
42-
</div>
438
.form-group{"ng-class" => "{'has-error': angularForm.subscriptions.$invalid}"}
449
%label.col-md-2.control-label
4510
= _('Type')
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#authkeyModalForm{"aria-hidden" => "true", :role => "dialog", :tabindex => "-1"}
2+
.modal-header
3+
%h4.modal-header SSH Information For An Appliance In the Region
4+
%form.form-horizontal{:name => "authkeyModalForm", "ng-submit" => "$ctrl.submitForm()"}
5+
.modal-body
6+
.form-group
7+
%label.col-sm-2.control-label Host
8+
.col-sm-10
9+
%input.form-control{:name => "ssh_host", "ng-model" => "$ctrl.ssh_params.ssh_host", :type => "text"}
10+
%p.help-block{"ng-show" => "authkeyModalForm.ssh_host.$invalid && !authkeyModalForm.ssh_host.$pristine"} SSH host is required.
11+
.form-group
12+
%label.col-sm-2.control-label User
13+
.col-sm-10
14+
%input.form-control{:name => "ssh_user", "ng-model" => "$ctrl.ssh_params.ssh_user", :type => "text"}
15+
%p.help-block{"ng-show" => "authkeyModalForm.ssh_user.$invalid && !authkeyModalForm.ssh_user.$pristine"} SSH user is required.
16+
.form-group
17+
%label.col-sm-2.control-label Password
18+
.col-sm-10
19+
%input.form-control{:name => "ssh_password", "ng-model" => "$ctrl.ssh_params.ssh_password", :type => "password"}
20+
%p.help-block{"ng-show" => "authkeyModalForm.ssh_password.$invalid && !authkeyModalForm.ssh_password.$pristine"} SSH password is required.
21+
.modal-footer
22+
%button.btn.btn-primary{"ng-disabled" => "authkeyModalForm.$invalid", :type => "submit"} Submit
23+
%button.btn.btn-default{"ng-click" => "$ctrl.cancelForm()"} Cancel

0 commit comments

Comments
 (0)