summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-04-16 02:54:24 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-04-25 21:17:28 +0200
commit5ef131f1f3711490576a8f512d822ded43a1f417 (patch)
tree86b3e3d7d583f6fd8040557fb91fd8a7d4cf530e
parent56bc2b9adf88469dd0258847210e8cf547367535 (diff)
downloadpki-5ef131f1f3711490576a8f512d822ded43a1f417.zip
pki-5ef131f1f3711490576a8f512d822ded43a1f417.tar.gz
pki-5ef131f1f3711490576a8f512d822ded43a1f417.tar.xz
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
-rw-r--r--base/tps/shared/conf/CS.cfg.in2
-rw-r--r--base/tps/shared/conf/db.ldif6
-rw-r--r--base/tps/shared/webapps/tps/js/user.js4
-rw-r--r--base/tps/shared/webapps/tps/ui/user.html4
4 files changed, 1 insertions, 15 deletions
diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index f467b59..39e5049 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 afa0c39..a88e66b 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 663b66f..f9f43c3 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 79867f9..435349e 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>