shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-24 21:34:41 +03:00
Code Issues Releases Wiki Activity

Added help to configuration

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-05-19 20:32:28 +02:00
parent 8d3653825a
commit fd0fbf63f0
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/uds/REST/methods/services.py
View File

@ -108,6 +108,7 @@ class Services(DetailHandler): # pylint: disable=too-many-public-methods
)
.exclude(state__in=State.INFO_STATES)
.count(),
'max_services_count_type': item.max_services_count_type,
'maintenance_mode': item.provider.maintenance_mode,
'permission': perm,
}
@ -150,7 +151,7 @@ class Services(DetailHandler): # pylint: disable=too-many-public-methods
# We need this fields for all
logger.debug('Saving service for %s / %s', parent, item)
fields = self.readFieldsFromParams(
['name', 'comments', 'data_type', 'tags', 'proxy_id']
['name', 'comments', 'data_type', 'tags', 'max_services_count_type']
)
tags = fields['tags']
del fields['tags']
@ -169,7 +170,6 @@ class Services(DetailHandler): # pylint: disable=too-many-public-methods
service.tags.set(
[models.Tag.objects.get_or_create(tag=val)[0] for val in tags]
)
service.proxy = proxy # type: ignore # Valid asignation, but mypy complains :)
serviceInstance = service.getInstance(self._params)
@ -234,6 +234,13 @@ class Services(DetailHandler): # pylint: disable=too-many-public-methods
}
},
{'user_services_count': {'title': _('User services'), 'type': 'numeric'}},
{
'max_services_count_type': {
'title': _('Max services count type'),
'type': 'dict',
'dict': {'0': _('Standard'), '1': _('Conservative')}
},
},
{'tags': {'title': _('tags'), 'visible': False}},
]
@ -283,6 +290,23 @@ class Services(DetailHandler): # pylint: disable=too-many-public-methods
localGui = self.addDefaultFields(
service.guiDescription(service), ['name', 'comments', 'tags']
)
self.addField(
localGui,
{
'name': 'max_services_count_type',
'values': [
gui.choiceItem('0', _('Standard')),
gui.choiceItem('1', _('Conservative')),
],
'label': _('Service counting method'),
'tooltip': _(
'Kind of service counting for calculating if MAX is reached'
),
'type': gui.InputField.CHOICE_TYPE,
'rdonly': False,
'order': 101,
},
)
return localGui

2
server/src/uds/static/admin/main.js
View File

File diff suppressed because one or more lines are too long

2
server/src/uds/templates/uds/admin/index.html
View File

@ -98,7 +98,7 @@
</svg>
</div>
</uds-root>
<script src="/uds/res/admin/runtime.js?stamp=1652944537" type="module"></script><script src="/uds/res/admin/polyfills.js?stamp=1652944537" type="module"></script><script src="/uds/res/admin/main.js?stamp=1652944537" type="module"></script>
<script src="/uds/res/admin/runtime.js?stamp=1652985115" type="module"></script><script src="/uds/res/admin/polyfills.js?stamp=1652985115" type="module"></script><script src="/uds/res/admin/main.js?stamp=1652985115" type="module"></script>
</body></html>