burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3.5'

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-11-08 13:20:11 +01:00
commit c89c8d0523
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/core/ui/user_interface.py
View File

@ -263,7 +263,7 @@ class gui:
'label': options.get('label', ''),
'defvalue': str(defvalue),
'rdonly': options.get(
'rdonly', options.get('readOnly', False)
'rdonly', options.get('readOnly', options.get('readonly', False))
), # This property only affects in "modify" operations
'order': options.get('order', 0),
'tooltip': options.get('tooltip', ''),

6
server/src/uds/services/Proxmox/provider.py
View File

@ -137,6 +137,7 @@ class ProxmoxProvider(
order=91,
tooltip=_('Starting machine id on proxmox'),
required=True,
rdonly=True,
tab=gui.ADVANCED_TAB,
)
@ -169,13 +170,14 @@ class ProxmoxProvider(
# Just reset _api connection variable
self._api = None
# All proxmox use same UniqueId generator
self._vmid_generator = UniqueIDGenerator('vmid', 'proxmox', 'proxmox')
if values is not None:
self.timeout.value = validators.validateTimeout(self.timeout.value)
logger.debug(self.host.value)
# All proxmox use same UniqueId generator
self._vmid_generator = UniqueIDGenerator('vmid', 'proxmox', 'proxmox')
def testConnection(self) -> bool:
"""
Test that conection to Proxmox server is fine

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=1635847312" defer></script><script src="/uds/res/admin/polyfills-es5.js?stamp=1635847312" nomodule defer></script><script src="/uds/res/admin/polyfills.js?stamp=1635847312" defer></script><script src="/uds/res/admin/main.js?stamp=1635847312" defer></script>
<script src="/uds/res/admin/runtime.js?stamp=1636373652" defer></script><script src="/uds/res/admin/polyfills-es5.js?stamp=1636373652" nomodule defer></script><script src="/uds/res/admin/polyfills.js?stamp=1636373652" defer></script><script src="/uds/res/admin/main.js?stamp=1636373652" defer></script>
</body></html>