-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge 'master' into 'show_physical_server_hardware_info'
- Loading branch information
Showing
36 changed files
with
372 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 25 additions & 23 deletions
48
app/assets/javascripts/controllers/auth_key_pair_cloud/auth_key_pair_cloud_controller.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,74 @@ | ||
| ManageIQ.angular.app.controller('keyPairCloudFormController', ['$http', '$scope', 'keyPairFormId', 'miqService', function($http, $scope, keyPairFormId, miqService) { | ||
| var vm = this; | ||
| var init = function() { | ||
| $scope.keyPairModel = { | ||
| vm.keyPairModel = { | ||
| name: '', | ||
| public_key: '', | ||
| ems_id: '' | ||
| }; | ||
| $scope.formId = keyPairFormId; | ||
| $scope.afterGet = false; | ||
| $scope.modelCopy = angular.copy( $scope.keyPairModel ); | ||
| $scope.model = 'keyPairModel'; | ||
| $scope.ems_choices = []; | ||
| ManageIQ.angular.scope = $scope; | ||
| vm.formId = keyPairFormId; | ||
| vm.afterGet = false; | ||
| vm.modelCopy = angular.copy( vm.keyPairModel ); | ||
| vm.model = 'keyPairModel'; | ||
| vm.ems_choices = []; | ||
| vm.saveable = miqService.saveable; | ||
| ManageIQ.angular.scope = vm; | ||
|
|
||
| miqService.sparkleOn(); | ||
| $http.get('/auth_key_pair_cloud/ems_form_choices') | ||
| .then(getAuthKeyPairCloudFormDataComplete) | ||
| .catch(miqService.handleFailure); | ||
|
|
||
| if (keyPairFormId == 'new') { | ||
| $scope.newRecord = true; | ||
| vm.newRecord = true; | ||
| } else { | ||
| $scope.newRecord = false; | ||
| vm.newRecord = false; | ||
| } | ||
| }; | ||
|
|
||
| var keyPairEditButtonClicked = function(buttonName, serializeFields) { | ||
| miqService.sparkleOn(); | ||
|
|
||
| var url = '/auth_key_pair_cloud/create/' + keyPairFormId + '?button=' + buttonName; | ||
| $scope.keyPairModel.ems_id = $scope.keyPairModel.ems.id; | ||
| if(serializeFields) { | ||
| miqService.miqAjaxButton(url, miqService.serializeModel($scope.keyPairModel)); | ||
| vm.keyPairModel.ems_id = vm.keyPairModel.ems.id; | ||
| if (serializeFields) { | ||
| miqService.miqAjaxButton(url, miqService.serializeModel(vm.keyPairModel)); | ||
| } else { | ||
| miqService.miqAjaxButton(url, false); | ||
| } | ||
| miqService.sparkleOff(); | ||
| }; | ||
|
|
||
| $scope.cancelClicked = function() { | ||
| vm.cancelClicked = function() { | ||
| keyPairEditButtonClicked('cancel', false); | ||
| $scope.angularForm.$setPristine(true); | ||
| }; | ||
|
|
||
| $scope.resetClicked = function() { | ||
| $scope.keyPairModel = angular.copy( $scope.modelCopy ); | ||
| vm.resetClicked = function() { | ||
| vm.keyPairModel = angular.copy( vm.modelCopy ); | ||
| $scope.angularForm.$setPristine(true); | ||
| miqService.miqFlash("warn", __("All changes have been reset")); | ||
| }; | ||
|
|
||
| $scope.saveClicked = function() { | ||
| vm.saveClicked = function() { | ||
| keyPairEditButtonClicked('save', true); | ||
| $scope.angularForm.$setPristine(true); | ||
| }; | ||
|
|
||
| $scope.addClicked = function() { | ||
| $scope.saveClicked(); | ||
| vm.addClicked = function() { | ||
| vm.saveClicked(); | ||
| }; | ||
|
|
||
| function getAuthKeyPairCloudFormDataComplete(response) { | ||
| var data = response.data; | ||
|
|
||
| $scope.ems_choices = data.ems_choices; | ||
| if($scope.ems_choices.length > 0) { | ||
| $scope.keyPairModel.ems = $scope.ems_choices[0]; | ||
| vm.ems_choices = data.ems_choices; | ||
| if (vm.ems_choices.length > 0) { | ||
| vm.keyPairModel.ems = vm.ems_choices[0]; | ||
| } | ||
| $scope.afterGet = true; | ||
| vm.afterGet = true; | ||
| miqService.sparkleOff(); | ||
| } | ||
|
|
||
| init(); | ||
| }]); | ||
| }]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.