From 4c9359ab625c700f150cfd8191e7181542089633 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 2 Aug 2011 10:26:12 -0500
Subject: 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 bd8f06247..781b59ec4 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 a84f54c19..b8e849211 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 7f91e2312..6128dd1f6 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;
-- 
cgit