From ce7e506c29d955f0c100a57220654bcdd3d2de38 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Thu, 31 Jul 2025 10:59:26 -0700
Subject: [PATCH] Fixed bug in gam <UserItem> print|show chatspaces asadmin
 fields <ChatSpaceFieldNameList>`

---
 src/GamUpdate.txt   | 5 +++++
 src/gam/__init__.py | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index 05ab8ca6..6afe2b06 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,8 @@
+7.17.03
+
+Fixed bug in gam <UserItem> print|show chatspaces asadmin fields <ChatSpaceFieldNameList>` that caused a trap
+when `isplayname` was not in `<ChatSpaceFieldNameList>`.
+
 7.17.02
 
 Updated `gam <UserTypeEntity> print|show webmastersites` to handle the following error
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 6bd8e891..229ff8ad 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.17.02'
+__version__ = '7.17.03'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -26940,7 +26940,7 @@ def printShowChatSpaces(users):
     substituteQueryTimes(queries, queryTimes)
     pfilter = kwargsCS['query'] = queries[0]
     kwargsCS['useAdminAccess'] = True
-    sortName = 'displayName'
+    sortName = 'displayName' if 'displayName' in fieldsList else 'name'
   else:
     sortName = 'name'
   for user in users: