From 190640136edc7fc6f5402df92ac11694daa3d32a Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 8 May 2020 20:01:57 +0200
Subject: [PATCH] EHN: add __version__ to caosdb and realm,username to userinfo
---
src/caosdb/__init__.py | 1 +
src/caosdb/common/models.py | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/caosdb/__init__.py b/src/caosdb/__init__.py
index 92922f79..75847bb1 100644
--- a/src/caosdb/__init__.py
+++ b/src/caosdb/__init__.py
@@ -41,6 +41,7 @@ from caosdb.common.models import (ACL, ALL, FIX, NONE, OBLIGATORY, RECOMMENDED,
from caosdb.configuration import configure, get_config
from caosdb.connection.connection import configure_connection, get_connection
from caosdb.exceptions import *
+from caosdb.version import version as __version__
# read configuration these files
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 293806a3..e229333c 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -3485,6 +3485,8 @@ class UserInfo():
def __init__(self, xml):
self.roles = [ role.text for role in xml.findall("Roles/Role")]
+ self.name = xml.get("username")
+ self.realm = xml.get("realm")
class Info():
--
GitLab