From 3cb19eb94fc06aed30bd3bca7178a7d1ba8c7183 Mon Sep 17 00:00:00 2001
From: Raviteja Cherughattu <rc835m@att.com>
Date: Thu, 21 May 2020 10:47:20 -0500
Subject: [PATCH] GUI Changes - Tag ID

Issue-ID: AAF-1147
Change-Id: Id1752887953a5084e8c6d1ff9a44eca487ce5c76
Signed-off-by: Raviteja Cherughattu <rc835m@att.com>
---
 auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java        | 4 ++--
 auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java        | 1 -
 .../src/main/java/org/onap/aaf/auth/gui/pages/CredDetail.java         | 2 +-
 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);
-- 
2.16.6