Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added "Copy from Provisioning" button on Retirement tab. #732

Merged
merged 2 commits into from
Mar 20, 2017
Merged

Added "Copy from Provisioning" button on Retirement tab. #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
094462f
Added "Copy from Provisioning" button on Retirement tab.
h-kataria Mar 17, 2017
7c38501
Addressed code climate errors.
h-kataria Mar 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
vm.catalogItemModel[prefix + '_playbook_id'] = '';
vm.catalogItemModel[prefix + '_repository_id'] = id;
} else {
vm['_' + prefix + '_playbook'] = _.find(vm[prefix + '_playbooks'], {id: vm.catalogItemModel[prefix + '_playbook_id']});
findObjectForDropDown(prefix, '_playbook', '_playbooks');
}
})
};
Expand Down Expand Up @@ -314,10 +314,14 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
var url = '/api/authentications?collection_class=' + typ + '&expand=resources&attributes=id,name' + sort_options;
API.get(url).then(function (data) {
vm[prefix + '_cloud_credentials'] = data.resources;
vm[prefix + '_cloud_credential'] = _.find(vm[prefix + '_cloud_credentials'], {id: vm.catalogItemModel[prefix + '_cloud_credential_id']});
findObjectForDropDown(prefix, '_cloud_credential', '_cloud_credentials');
})
};

var findObjectForDropDown = function(prefix, fieldName, listName) {
vm['_' + prefix + fieldName] = _.find(vm[prefix + listName], {id: vm.catalogItemModel[prefix + fieldName + '_id']});
}

vm.playbookTypeChanged = function(prefix) {
if (prefix === "retirement")
getRemoveResourcesTypes();
Expand Down Expand Up @@ -403,5 +407,44 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
});
}

$scope.cancelCopyProvisioning = function() {
closeConfirmationModal();
}

$scope.copyProvisioning = function() {
closeConfirmationModal();
vm.formOptions();
vm.catalogItemModel.retirement_repository_id = vm.catalogItemModel.provisioning_repository_id;
vm.catalogItemModel.retirement_playbook_id = vm.catalogItemModel.provisioning_playbook_id;
vm.catalogItemModel.retirement_machine_credential_id = vm.catalogItemModel.provisioning_machine_credential_id;
vm.catalogItemModel.retirement_network_credential_id = vm.catalogItemModel.provisioning_network_credential_id;
vm.catalogItemModel.retirement_cloud_type = vm.catalogItemModel.provisioning_cloud_type;
vm.catalogItemModel.retirement_cloud_credential_id = vm.catalogItemModel.provisioning_cloud_credential_id;
if (vm.catalogItemModel.retirement_cloud_type !== '')
$scope.cloudTypeChanged('retirement');
vm.catalogItemModel.retirement_inventory = vm.catalogItemModel.provisioning_inventory;
vm.catalogItemModel.retirement_dialog_existing = vm.catalogItemModel.provisioning_dialog_existing;
vm.catalogItemModel.retirement_dialog_id = vm.catalogItemModel.provisioning_dialog_id;
vm.catalogItemModel.retirement_dialog_name = vm.catalogItemModel.provisioning_dialog_name;
vm.catalogItemModel.retirement_key = '';
vm.catalogItemModel.retirement_value = '';
vm.catalogItemModel.retirement_variables = angular.copy(vm.catalogItemModel.provisioning_variables);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@h-kataria - Do we have to worry about the ae_instance (retirement entry points - 'yes_without_playbook', 'no_without_playbook' etc.) getting set here as well? - Possibly that is pulled in already from the vm.catalogItemModel object, and already exists?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@syncrou that is already set when the form loads, no need to set when copying provisioning fields.

}

var closeConfirmationModal = function() {
angular.element('#confirmationModal').modal("hide");
}

init();
}]);

// Javascript function to be called from confirmation modal outside of Angular controller.
function cancelOrCopyProvisioning(buttonType) {
var scope = angular.element("#form_div").scope();
scope.$apply(function () {
if (buttonType == "cancel")
scope.cancelCopyProvisioning();
else
scope.copyProvisioning();
});
}
48 changes: 48 additions & 0 deletions app/views/catalog/_confirmation_modal.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.modal.fade#confirmationModal{"tabindex" => "-1",
"role" => "dialog",
"aria-labelledby" => "confirmation_modal_label",
"aria-describedby" => "modal",
"aria-hidden" => "true",
"data-keyboard" => "false",
"data-backdrop" => "static",
:style => "display: none"}
.modal-dialog
.modal-content
#search_notification{:style => "display: none;"}
.modal-header
%button.close{"data-dismiss" => "modal"}
%span{"aria-hidden" => "true"}
×
%span.sr-only
Close
%h4.modal-title#confirmation_modal_label
= _("Copy from Provisioning")
.modal-body
.form-group
%label.control-label.col-md-2
%img{:src => image_path("100/warning.png")}
.col-md-8
= _("Are you sure you want the retirement options to be copied from provisioning?")
%p
= _("Warning: You will loose all of your current retirement options if you continue with this action")
.modal-footer
#confirmation_modal_footer
= button_tag(_('Cancel'),
:class => "btn btn-default",
:alt => t = _("Cancel Copy from provisioning"),
:title => t,
:onclick => "cancelOrCopyProvisioning('cancel')")
= button_tag(_('Copy'),
:class => "btn btn-primary",
:alt => t = _("Copy from provisioning"),
:title => t,
:onclick => "cancelOrCopyProvisioning('copy')")

:javascript
$(function(){
$('#confirmationModal').off("click");
$('#confirmationModal').on('click', '[data-dismiss="modal"]', function() {
$('#confirmationModal').modal("hide")
});
});

16 changes: 16 additions & 0 deletions app/views/layouts/angular/_ansible_form_options_angular.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
- prefix ||= 'provisioning'
.row
.col-md-12.col-lg-6
- if prefix == "retirement"
= render :partial => 'catalog/confirmation_modal'
.form-group
%label.col-md-3.control-label
%table{:width => "100%", :align => "bottom"}
%tr
%td#buttons_on
%button{"type" => "button",
:class => "btn btn-default",
"data-toggle" => "modal",
"data-target" => "#confirmationModal",
"data-whatever" => "@mdo",
:id => "confirmation_modal",
:title => _("Copy from Provisioning")}
= _('Copy from Provisioning')

.form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_repository_id.$invalid}"}
%label.col-md-3.control-label{"for" => "vm.#{prefix}_repository_id"}
= _('Repository')
Expand Down