Bugzilla Bug #491019 - Security Officer: Format Card operation to format a user card.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@610 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

3 files changed, 6 insertions, 6 deletions

diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 346d53d9b..936c86f63 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      9
+%define base_release      10
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Jun 13 2009 Jack Magne <jmagne@redhat.com> 1.1.0-10 
+- Bugzilla Bug #491019 - Security Officer: Format Card operation to format a user card
+  also formats a security officer card.
 * Sun Jun 7 2009 Ade Lee <alee@redhat.com> 1.1.0-9
 * Bugzilla Bug #504042 - unable to list users that where created with a space in the name
 * Mon Jun 1 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-8
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
index 6f0b78358..1f6781c2d 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
@@ -73,9 +73,7 @@ function UserOnDoneInitializeBindingTable()
   {
     var keyType = arr[i][0];
     var keyID = arr[i][1];
-    var keyStatus = GetStatusForKeyID(keyType, keyID);
-    updateKeyText('A ' + keyStatus + ' smartcard "' + keyID + '" is detected!');
-    UserSelectRowByKeyID(keyType, keyID);
+    UserOnCOOLKeyInserted(keyType,keyID);
   }
 }
 
@@ -88,7 +86,6 @@ function UserOnCOOLKeyInserted(keyType, keyID)
     updateKeyText('A ' + keyStatus + ' smartcard "' + keyID + '" is detected!');
   }
   UserSelectRowByKeyID(keyType, keyID);
-
    var uid = null;
   var isUser = false;
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
index 48bd2dcc1..18a3005ab 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
@@ -1760,7 +1760,7 @@ function GetCoolKeyIssuedTo(keyType,keyID)
 
   try {
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      issuedTo = netkey.GetCoolKeyIssuedTo(keyType,keyID);
+      issuedTo = netkey.GetCoolKeyUID(keyType,keyID);
 
   } catch (e)
   {