shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-02-02 09:47:13 +03:00
Code Issues Releases Wiki Activity

fixed proxmox tooltips && fixed error page redirection

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-04-13 10:35:23 +02:00
parent b8c37b279a
commit d7e30d149c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,19 +61,19 @@ class ProxmoxProvider(services.ServiceProvider): # pylint: disable=too-many-pub
port = gui.NumericField(lengh=5, label=_('Port'), order=2, tooltip=_('Proxmox API port (default is 8006)'), required=True, defvalue='8006')
username = gui.TextField(length=32, label=_('Username'), order=3, tooltip=_('User with valid privileges on Proxmox, (use "user@authenticator" form)'), required=True, defvalue='root@pam')
password = gui.PasswordField(lenth=32, label=_('Password'), order=4, tooltip=_('Password of the user of oVirt'), required=True)
password = gui.PasswordField(lenth=32, label=_('Password'), order=4, tooltip=_('Password of the user of Proxmox'), required=True)
maxPreparingServices = gui.NumericField(length=3, label=_('Creation concurrency'), defvalue='10', minValue=1, maxValue=65536, order=50, tooltip=_('Maximum number of concurrently creating VMs'), required=True, tab=gui.ADVANCED_TAB)
maxRemovingServices = gui.NumericField(length=3, label=_('Removal concurrency'), defvalue='5', minValue=1, maxValue=65536, order=51, tooltip=_('Maximum number of concurrently removing VMs'), required=True, tab=gui.ADVANCED_TAB)
timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='20', order=90, tooltip=_('Timeout in seconds of connection to oVirt'), required=True, tab=gui.ADVANCED_TAB)
timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='20', order=90, tooltip=_('Timeout in seconds of connection to Proxmox'), required=True, tab=gui.ADVANCED_TAB)
# Own variables
_api: typing.Optional[client.ProxmoxClient] = None
def __getApi(self) -> client.ProxmoxClient:
"""
Returns the connection API object for oVirt (using ovirtsdk)
Returns the connection API object
"""
if self._api is None:
self._api = client.ProxmoxClient(self.host.value, self.port.num(), self.username.value, self.password.value, self.timeout.num(), False, self.cache)
@ -95,7 +95,7 @@ class ProxmoxProvider(services.ServiceProvider): # pylint: disable=too-many-pub
def testConnection(self) -> bool:
"""
Test that conection to oVirt server is fine
Test that conection to Proxmox server is fine
Returns

2
server/src/uds/web/util/errors.py
View File

@ -111,7 +111,7 @@ def errorView(request: 'HttpRequest', errorCode: int) -> HttpResponseRedirect:
errStr = encoders.encodeAsStr(str(errStr), 'base64').replace('\n', '')
logger.debug('Redirection to error view with %s', errStr)
return HttpResponseRedirect(reverse('page.error', kwargs={'error': errStr}))
return HttpResponseRedirect(reverse('page.error', kwargs={'err': errStr}))
def exceptionView(request: 'HttpRequest', exception: Exception) -> HttpResponseRedirect:

2
server/src/uds/web/views/auth.py
View File

@ -216,7 +216,7 @@ def ticketAuth(request: 'HttpRequest', ticketId: str) -> HttpResponse: # pylint
request.session['launch'] = link
response = HttpResponseRedirect(reverse('page.ticket.launcher'))
else:
response = HttpResponsePermanentRedirect(reverse('page.index'))
response = HttpResponseRedirect(reverse('page.index'))
# Now ensure uds cookie is at response
getUDSCookie(request, response, True)