summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorJohn Franey <john.franey@att.com>2020-05-21 19:05:22 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-21 19:05:22 +0000
commitf8e4fae3bb0e9a7d40a70a64971efd1813bee2d1 (patch)
tree3b6e9c5e97f3b5f7a88bdf3e20681def972c5749 /auth
parent0d982409d8931d92e62c88414ece2c48ab5e4b52 (diff)
parent3cb19eb94fc06aed30bd3bca7178a7d1ba8c7183 (diff)
Merge "GUI Changes - Tag ID"
Diffstat (limited to 'auth')
-rw-r--r--auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java4
-rw-r--r--auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java1
-rw-r--r--auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CredDetail.java2
3 files changed, 3 insertions, 4 deletions
diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java
index ef25f75a..84a01614 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java
@@ -39,7 +39,7 @@ import aaf.v2_0.Users.User;
public class List extends BaseCmd<NS> {
- private static final String cformat = " %-30s %-6s %-24s\n";
+ private static final String cformat = " %-30s %-6s %-24s %-20s\n";
private static final String pformat = " %-30s %-24s %-15s\n";
private static final String sformat = " %-72s\n";
protected static final String kformat = " %-72s\n";
@@ -152,7 +152,7 @@ public class List extends BaseCmd<NS> {
if (this.aafcli.isTest()) {
pw().format(sformat,u.getId());
} else {
- pw().format(cformat,u.getId(),getType(u),Chrono.niceDateStamp(u.getExpires()));
+ pw().format(cformat,u.getId(),getType(u),Chrono.niceDateStamp(u.getExpires()),u.getTag());
}
}
}
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
index ca31e15e..8492b85f 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
@@ -127,7 +127,6 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
String defTheme = env.getProperty(AAF_GUI_THEME,"onap");
env.put(sDefaultTheme, defTheme);
-
sThemeWebPath = env.staticSlot(CachingFileAccess.CFA_WEB_PATH);
if(env.get(sThemeWebPath)==null) {
env.put(sThemeWebPath,"theme");
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CredDetail.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CredDetail.java
index 4ad7893a..e98b40f2 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CredDetail.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CredDetail.java
@@ -285,7 +285,7 @@ public class CredDetail extends Page {
}
first=false;
hgen.end().leaf(HTMLGen.TD,cls,STYLE_WIDTH_70)
- .text(Chrono.niceDateStamp(u.getExpires()))
+ .text(Chrono.niceDateStamp(u.getExpires()) + ", TAG ID: " + u.getTag())
.end();
hgen.end(uRow);