IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed the way how to handle remove hold and revoke actions

Browse Source 
Method calling in actions is moved to another function - these calls may be used
by another functions, not only by actions.

https://fedorahosted.org/freeipa/ticket/5381

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Pavel Vomacka 2016-04-22 11:13:06 +02:00 committed by Petr Vobornik
parent 06a9a84876
commit 260a00b81f
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
install/ui/src/freeipa/certificate.js
View File

@ -787,6 +787,25 @@ IPA.cert.request_action = function(spec) {
return that;
};
IPA.cert.perform_revoke = function(spec, sn, revocation_reason) {
spec.hide_activity_icon = spec.hide_activity_icon || false;
rpc.command({
entity: 'cert',
method: 'revoke',
hide_activity_icon: spec.hide_activity_icon,
args: [ sn ],
options: {
'revocation_reason': revocation_reason
},
notify_activity_start: spec.notify_activity_start,
notify_activity_end: spec.notify_activity_end,
on_success: spec.on_success,
on_error: spec.on_error
}).execute();
};
IPA.cert.revoke_action = function(spec) {
spec = spec || {};
@ -822,21 +841,17 @@ IPA.cert.revoke_action = function(spec) {
that.execute_action = function(facet) {
var certificate = facet.certificate;
rpc.command({
entity: 'cert',
method: 'revoke',
args: [certificate.serial_number],
options: {
'revocation_reason': that.dialog.get_reason()
},
var spec = {
on_success: function(data, text_status, xhr) {
facet.refresh();
IPA.notify_success('@i18n:objects.cert.revoked');
facet.certificate_updated.notify([], that.facet);
}
}).execute();
};
var sn = facet.certificate.serial_number;
var revocation_reason = that.dialog.get_reason();
IPA.cert.perform_revoke(spec, sn, revocation_reason);
};
return that;
@ -881,23 +896,31 @@ IPA.cert.remove_hold_action = function(spec) {
that.execute_action = function(facet) {
var certificate = facet.certificate;
rpc.command({
entity: 'cert',
method: 'remove_hold',
args: [certificate.serial_number],
var spec = {
on_success: function(data, text_status, xhr) {
facet.refresh();
IPA.notify_success('@i18n:objects.cert.hold_removed');
facet.certificate_updated.notify([], that.facet);
}
}).execute();
};
IPA.cert.perform_remove_hold(spec, facet.certificate.serial_number);
};
return that;
};
IPA.cert.perform_remove_hold = function(spec, sn) {
rpc.command({
entity: 'cert',
method: 'remove_hold',
args: [sn],
on_success: spec.on_success
}).execute();
};
IPA.cert.certificate_evaluator = function(spec) {
spec.name = spec.name || 'has_certificate_evaluator';