Sorted alphabetically Services

This commit is contained in:
Adolfo Gómez 2013-10-16 11:45:17 +00:00
parent fb463dee73
commit ea784bfeef
2 changed files with 5 additions and 2 deletions

View File

@ -93,14 +93,15 @@ class HTML5RDPTransport(Transport):
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:
username, domain = username.split('@') username, domain = username.split('@')
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 '':

View File

@ -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'