The certificate buttons including Get, View, Revoke, Restore for hosts
and services have been fixed to use the correct entity name.
Ticket #1556
--
Endi S. Dewata
From 972907a576f5d41036f3c356f7fe7061091b516e Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edew...@redhat.com>
Date: Tue, 2 Aug 2011 10:26:12 -0500
Subject: [PATCH] Fixed certificate buttons.
The certificate buttons including Get, View, Revoke, Restore for hosts
and services have been fixed to use the correct entity name.
Ticket #1556
---
install/ui/certificate.js | 10 +++++-----
install/ui/host.js | 3 ---
install/ui/service.js | 3 ---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/install/ui/certificate.js b/install/ui/certificate.js
index bd8f06247c7e02469432f303c68771d07673bfb7..781b59ec48cbf784a9dd0f5a55598d3d32af5c06 100755
--- a/install/ui/certificate.js
+++ b/install/ui/certificate.js
@@ -371,7 +371,7 @@ IPA.cert.status_widget = function(spec) {
var that = IPA.widget(spec);
- that.entity_label = spec.entity_label || that.entity_name;
+ that.entity_label = spec.entity_label || that.entity.metadata.label_singular;
that.result = spec.result;
@@ -516,7 +516,7 @@ IPA.cert.status_widget = function(spec) {
label: IPA.messages.buttons.get,
click: function() {
IPA.command({
- entity: that.entity_name,
+ entity: that.entity.name,
method: 'show',
args: [that.pkey],
on_success: function(data, text_status, xhr) {
@@ -534,7 +534,7 @@ IPA.cert.status_widget = function(spec) {
label: IPA.messages.buttons.revoke,
click: function() {
IPA.command({
- entity: that.entity_name,
+ entity: that.entity.name,
method: 'show',
args: [that.pkey],
on_success: function(data, text_status, xhr) {
@@ -552,7 +552,7 @@ IPA.cert.status_widget = function(spec) {
label: IPA.messages.buttons.view,
click: function() {
IPA.command({
- entity: that.entity_name,
+ entity: that.entity.name,
method: 'show',
args: [that.pkey],
on_success: function(data, text_status, xhr) {
@@ -572,7 +572,7 @@ IPA.cert.status_widget = function(spec) {
label: IPA.messages.buttons.restore,
click: function() {
IPA.command({
- entity: that.entity_name,
+ entity: that.entity.name,
method: 'show',
args: [that.pkey],
on_success: function(data, text_status, xhr) {
diff --git a/install/ui/host.js b/install/ui/host.js
index a84f54c190257e19efadcbdf0754b431eb4bd6de..b8e849211e2a43d9f1a07dc5cb16730f72f034da 100644
--- a/install/ui/host.js
+++ b/install/ui/host.js
@@ -432,9 +432,6 @@ IPA.host_certificate_status_widget = function (spec) {
var that = IPA.cert.status_widget(spec);
-
- that.entity_label = that.entity.metadata.label_singular;
-
that.get_entity_pkey = function(result) {
var values = result['fqdn'];
return values ? values[0] : null;
diff --git a/install/ui/service.js b/install/ui/service.js
index 7f91e23123cd3b5ba29dad359bc410f739831f33..6128dd1f6d7fecb627d44053cf69c7f67bec133b 100644
--- a/install/ui/service.js
+++ b/install/ui/service.js
@@ -319,9 +319,6 @@ IPA.service_certificate_status_widget = function (spec) {
var that = IPA.cert.status_widget(spec);
-
- that.entity_label = that.entity.metadata.label_singular;
-
that.get_entity_pkey = function(result) {
var values = result['krbprincipalname'];
return values ? values[0] : null;
--
1.7.5.1
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
