Fixes for new administration interface

server/src/uds/REST/methods/authenticators.py

@@ -55,7 +55,7 @@ class Authenticators(ModelHandler):
     detail = {'users': Users, 'groups': Groups}
     save_fields = ['name', 'comments', 'tags', 'priority', 'small_name']
 
-    table_title = _('Current authenticators')
+    table_title = _('Authenticators')
     table_fields = [
         {'numeric_id': {'title': _('Id'), 'visible': True}},
         {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},

server/src/uds/REST/methods/networks.py

@@ -56,7 +56,7 @@ class Networks(ModelHandler):
     model = Network
     save_fields = ['name', 'net_string', 'tags']
 
-    table_title = _('Current Networks')
+    table_title = _('Networks')
     table_fields = [
         {'name': {'title': _('Name'), 'visible': True, 'type': 'icon', 'icon': 'fa fa-globe text-success'}},
         {'net_string': {'title': _('Range')}},

server/src/uds/REST/methods/osmanagers.py

@@ -52,7 +52,7 @@ class OsManagers(ModelHandler):
     model = OSManager
     save_fields = ['name', 'comments', 'tags']
 
-    table_title = _('Current OS Managers')
+    table_title = _('OS Managers')
     table_fields = [
         {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
         {'comments': {'title': _('Comments')}},

server/src/uds/REST/methods/services_pools.py

@@ -88,13 +88,13 @@ class ServicesPools(ModelHandler):
     table_title = _('Service Pools')
     table_fields = [
         {'name': {'title': _('Name')}},
-        {'state': {'title': _('status'), 'type': 'dict', 'dict': State.dictionary()}},
+        {'state': {'title': _('Status'), 'type': 'dict', 'dict': State.dictionary()}},
         {'user_services_count': {'title': _('User services'), 'type': 'number'}},
         {'user_services_in_preparation': {'title': _('In Preparation')}},
         {'visible': {'title': _('Visible'), 'type': 'callback'}},
         {'show_transports': {'title': _('Shows transports'), 'type': 'callback'}},
-        {'pool_group_name': {'title': _('Pool Group')}},
-        {'parent': {'title': _('Parent Service')}},
+        {'pool_group_name': {'title': _('Pool group')}},
+        {'parent': {'title': _('Parent service')}},
         {'tags': {'title': _('tags'), 'visible': False}},
     ]
     # Field from where to get "class" and prefix for that class, so this will generate "row-state-A, row-state-X, ....

server/src/uds/REST/methods/services_usage.py

@@ -43,15 +43,14 @@ from uds.core.util.model import processUuid
 from uds.core.util import log
 from uds.REST.model import DetailHandler
 
-
-
 import logging
 
 logger = logging.getLogger(__name__)
 
+
 class ServicesUsage(DetailHandler):
     """
-    Rest handler for Assigned Services, wich parent is Service
+    Rest handler for Assigned Services, which parent is Service
     """
 
     @staticmethod
@@ -76,7 +75,6 @@ class ServicesUsage(DetailHandler):
                'user_id': item.user.uuid
             }
 
-
         return {
             'id': item.uuid,
             'state_date': item.state_date,

server/src/uds/REST/methods/transports.py

@@ -51,7 +51,7 @@ class Transports(ModelHandler):
     model = Transport
     save_fields = ['name', 'comments', 'tags', 'priority', 'nets_positive', 'allowed_oss']
 
-    table_title = _('Current Transports')
+    table_title = _('Transports')
     table_fields = [
         {'priority': {'title': _('Priority'), 'type': 'numeric', 'width': '6em'}},
         {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},

server/src/uds/REST/methods/user_services.py

@@ -245,6 +245,7 @@ class Groups(DetailHandler):
             'id': i.uuid,
             'auth_id': i.manager.uuid,
             'name': i.name,
+            'group_name': i.pretty_name,
             'comments': i.comments,
             'state': i.state,
             'type': i.is_meta and 'meta' or 'group',
@@ -292,6 +293,7 @@ class Transports(DetailHandler):
             'type': self.typeAsDict(i.getType()),
             'comments': i.comments,
             'priority': i.priority,
+            'trans_type': _(i.getType().name()),
         } for i in parent.transports.all()]
 
     def getTitle(self, parent):