Adjustments to the Devices Layout
This commit is contained in:
@@ -44,16 +44,19 @@ def _resolve_names(db, device_id: str | None, user_id: str | None) -> tuple[str,
|
||||
device_name = ""
|
||||
user_name = ""
|
||||
|
||||
if device_id:
|
||||
device_doc = db.collection("devices").document(device_id).get()
|
||||
if device_doc.exists:
|
||||
device_name = device_doc.to_dict().get("device_name", "")
|
||||
try:
|
||||
if device_id and isinstance(device_id, str) and device_id.strip():
|
||||
device_doc = db.collection("devices").document(device_id.strip()).get()
|
||||
if device_doc.exists:
|
||||
device_name = device_doc.to_dict().get("device_name", "")
|
||||
|
||||
if user_id:
|
||||
user_doc = db.collection("users").document(user_id).get()
|
||||
if user_doc.exists:
|
||||
user_doc_data = user_doc.to_dict()
|
||||
user_name = user_doc_data.get("display_name", "") or user_doc_data.get("email", "")
|
||||
if user_id and isinstance(user_id, str) and user_id.strip():
|
||||
user_doc = db.collection("users").document(user_id.strip()).get()
|
||||
if user_doc.exists:
|
||||
user_doc_data = user_doc.to_dict()
|
||||
user_name = user_doc_data.get("display_name", "") or user_doc_data.get("email", "")
|
||||
except Exception as e:
|
||||
print(f"[equipment] Error resolving names (device_id={device_id}, user_id={user_id}): {e}")
|
||||
|
||||
return device_name, user_name
|
||||
|
||||
|
||||
Reference in New Issue
Block a user