diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-02-03 23:54:56 +0100 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-02-05 16:08:10 +0100 |
commit | 987dda15acdd6e6f4c7c477fed122a76ad40260c (patch) | |
tree | 400ec3be7e2c4a314d64be8dcc7bd6e746cd9262 /base/tps/shared/webapps/tps/ui | |
parent | 4c1f6b632fe5493ba3bfe106257192d3fc088f15 (diff) | |
download | pki-987dda15acdd6e6f4c7c477fed122a76ad40260c.tar.gz pki-987dda15acdd6e6f4c7c477fed122a76ad40260c.tar.xz pki-987dda15acdd6e6f4c7c477fed122a76ad40260c.zip |
Fixed token add operation.
The TPS UI and CLI have been modified to accept only token ID,
and optionally user ID and policy attributes when adding a token.
https://fedorahosted.org/pki/ticket/1477
https://fedorahosted.org/pki/ticket/1687
Diffstat (limited to 'base/tps/shared/webapps/tps/ui')
-rw-r--r-- | base/tps/shared/webapps/tps/ui/token.html | 22 | ||||
-rw-r--r-- | base/tps/shared/webapps/tps/ui/tokens.html | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/base/tps/shared/webapps/tps/ui/token.html b/base/tps/shared/webapps/tps/ui/token.html index 90b9c72a5..aaf181414 100644 --- a/base/tps/shared/webapps/tps/ui/token.html +++ b/base/tps/shared/webapps/tps/ui/token.html @@ -43,24 +43,24 @@ <div name="token" class="pki-fields"> <fieldset> - <label>Token ID</label> + <label name="tokenID">Token ID</label> <input name="tokenID" readonly="readonly"><br> - <label>User ID</label> + <label name="userID">User ID</label> <input name="userID" readonly="readonly"><br> - <label>Type</label> + <label name="policy">Policy</label> + <input name="policy" readonly="readonly"><br> + <label name="type">Type</label> <input name="type" readonly="readonly"><br> - <label>Status</label> - <input name="statusLabel" readonly="readonly"><br> - <label>Applet ID</label> + <label name="appletID">Applet ID</label> <input name="appletID" readonly="readonly"><br> - <label>Key Info</label> + <label name="keyInfo">Key Info</label> <input name="keyInfo" readonly="readonly"><br> - <label>Policy</label> - <input name="policy" readonly="readonly"><br> - <label>Created</label> + <label name="createTimestamp">Created</label> <input name="createTimestamp" readonly="readonly"><br> - <label>Modified</label> + <label name="modifyTimestamp">Modified</label> <input name="modifyTimestamp" readonly="readonly"><br> + <label name="status">Status</label> + <input name="statusLabel" readonly="readonly"><br> </fieldset> </div> diff --git a/base/tps/shared/webapps/tps/ui/tokens.html b/base/tps/shared/webapps/tps/ui/tokens.html index 42a93cd93..ec89de958 100644 --- a/base/tps/shared/webapps/tps/ui/tokens.html +++ b/base/tps/shared/webapps/tps/ui/tokens.html @@ -105,9 +105,6 @@ <input name="userID" readonly="readonly"><br> <label>Type</label> <input name="type" readonly="readonly"><br> - <label>Status</label> - <select name="status"> - </select><br> <label>Applet ID</label> <input name="appletID" readonly="readonly"><br> <label>Key Info</label> @@ -118,6 +115,9 @@ <input name="createTimestamp" readonly="readonly"><br> <label>Modified</label> <input name="modifyTimestamp" readonly="readonly"><br> + <label>Status</label> + <select name="status"> + </select><br> </fieldset> </div> <div class="modal-footer"> |