forked from shaba/openuds
Sorted alphabetically Services
This commit is contained in:
parent
fb463dee73
commit
ea784bfeef
@ -92,6 +92,9 @@ class HTML5RDPTransport(Transport):
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
username = user.getUsernameForAuth()
|
username = user.getUsernameForAuth()
|
||||||
|
|
||||||
|
if self.fixedName.value is not '':
|
||||||
|
username = self.fixedName.value
|
||||||
|
|
||||||
domain = ''
|
domain = ''
|
||||||
if username.find('@') != -1:
|
if username.find('@') != -1:
|
||||||
@ -99,8 +102,6 @@ class HTML5RDPTransport(Transport):
|
|||||||
elif username.find('\\') != -1:
|
elif username.find('\\') != -1:
|
||||||
domain, username = username.split('\\')
|
domain, username = username.split('\\')
|
||||||
|
|
||||||
if self.fixedName.value is not '':
|
|
||||||
username = self.fixedName.value
|
|
||||||
if self.fixedPassword.value is not '':
|
if self.fixedPassword.value is not '':
|
||||||
password = self.fixedPassword.value
|
password = self.fixedPassword.value
|
||||||
if self.fixedDomain.value is not '':
|
if self.fixedDomain.value is not '':
|
||||||
|
@ -191,6 +191,8 @@ def index(request):
|
|||||||
|
|
||||||
logger.debug('Services: {0}'.format(services))
|
logger.debug('Services: {0}'.format(services))
|
||||||
|
|
||||||
|
services = sorted(services, key=lambda s: s['name'])
|
||||||
|
|
||||||
if len(services) == 1 and GlobalConfig.AUTORUN_SERVICE.get(True) == '1' and len(services[0]['transports']) > 0:
|
if len(services) == 1 and GlobalConfig.AUTORUN_SERVICE.get(True) == '1' and len(services[0]['transports']) > 0:
|
||||||
if request.session.get('autorunDone', '0') == '0':
|
if request.session.get('autorunDone', '0') == '0':
|
||||||
request.session['autorunDone'] = '1'
|
request.session['autorunDone'] = '1'
|
||||||
|
Loading…
Reference in New Issue
Block a user