From 5ef131f1f3711490576a8f512d822ded43a1f417 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Sat, 16 Apr 2016 02:54:24 +0200
Subject: Removed unused TPS user fields and group.

The unused user status and type fields and the TPS Officers group
have been removed from the TPS UI.

https://fedorahosted.org/pki/ticket/2264
https://fedorahosted.org/pki/ticket/2265
https://fedorahosted.org/pki/ticket/2266
---
 base/tps/shared/conf/CS.cfg.in           | 2 +-
 base/tps/shared/conf/db.ldif             | 6 ------
 base/tps/shared/webapps/tps/js/user.js   | 4 ----
 base/tps/shared/webapps/tps/ui/user.html | 4 ----
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index f467b5968..39e504976 100644
--- a/base/tps/shared/conf/CS.cfg.in
+++ b/base/tps/shared/conf/CS.cfg.in
@@ -1565,7 +1565,7 @@ pkicreate.unsecure_port=[PKI_UNSECURE_PORT]
 pkicreate.user=[PKI_USER]
 pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_NAME]
 preop.admincert.profile=caAdminCert
-preop.admin.group=TPS Agents,TPS Operators,Administrators,TPS Officers
+preop.admin.group=TPS Agents,TPS Operators,Administrators
 preop.admin.name=Token Processing Service Manager Administrator
 preop.cert.admin.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.admin.dn=uid=admin,cn=admin
diff --git a/base/tps/shared/conf/db.ldif b/base/tps/shared/conf/db.ldif
index afa0c3920..a88e66bcb 100644
--- a/base/tps/shared/conf/db.ldif
+++ b/base/tps/shared/conf/db.ldif
@@ -35,12 +35,6 @@ objectClass: groupOfUniqueNames
 cn: TPS Agents
 description: Agents for TPS
 
-dn: cn=TPS Officers,ou=Groups,{rootSuffix}
-objectClass: top
-objectClass: groupOfUniqueNames
-cn: TPS Officers
-description: Security Officers for TPS
-
 dn: cn=Administrators,ou=Groups,{rootSuffix}
 objectClass: top
 objectClass: groupOfUniqueNames
diff --git a/base/tps/shared/webapps/tps/js/user.js b/base/tps/shared/webapps/tps/js/user.js
index 663b66fc5..f9f43c34f 100644
--- a/base/tps/shared/webapps/tps/js/user.js
+++ b/base/tps/shared/webapps/tps/js/user.js
@@ -40,8 +40,6 @@ var UserModel = Model.extend({
             userID: response.UserID,
             fullName: response.FullName,
             email: response.Email,
-            state: response.State,
-            type: response.Type,
             attributes: attrs
         };
     },
@@ -59,8 +57,6 @@ var UserModel = Model.extend({
             UserID: attributes.userID,
             FullName: attributes.fullName,
             Email: attributes.email,
-            State: attributes.state,
-            Type: attributes.type,
             Attributes: {
                 Attribute: attrs
             }
diff --git a/base/tps/shared/webapps/tps/ui/user.html b/base/tps/shared/webapps/tps/ui/user.html
index 79867f900..435349e5a 100644
--- a/base/tps/shared/webapps/tps/ui/user.html
+++ b/base/tps/shared/webapps/tps/ui/user.html
@@ -47,10 +47,6 @@
     <input name="fullName" readonly="readonly"><br>
     <label>Email</label>
     <input name="email" readonly="readonly"><br>
-    <label>Type</label>
-    <input name="type" readonly="readonly"><br>
-    <label>State</label>
-    <input name="state" readonly="readonly"><br>
 </fieldset>
 </div>
 
-- 
cgit