fixed where to get fixed credentials

This commit is contained in:
Adolfo Gómez 2013-10-16 11:26:58 +00:00
parent 1ea5987975
commit d5e71be73c
3 changed files with 7 additions and 5 deletions

View File

@ -1976,7 +1976,7 @@ class DelayedTask(models.Model):
#objects = LockingManager()
def __unicode__(self):
return u"Run Queue task {0} owned by {3},inserted at {1} and with {2} seconds delay".format(self.type, self.insert_date, self.execution_delay, self.owner_server)
return u"Run Queue task {0} owned by {3},inserted at {1} and with {2} seconds delay {3}".format(self.type, self.insert_date, self.execution_delay, self.execution_time)
class Network(models.Model):

View File

@ -157,6 +157,9 @@ class RDPTransport(Transport):
username = user.getUsernameForAuth()
prefs = user.prefs('rdp')
if self._fixedName is not '':
username = self._fixedName
proc = username.split('@')
if len(proc) > 1:
domain = proc[1]
@ -164,8 +167,6 @@ class RDPTransport(Transport):
domain = ''
username = proc[0]
if self._fixedName is not '':
username = self._fixedName
if self._fixedPassword is not '':
password = self._fixedPassword
if self._fixedDomain is not '':

View File

@ -146,14 +146,15 @@ class TSRDPTransport(Transport):
username = user.getUsernameForAuth()
prefs = user.prefs('rdp')
if self._fixedName is not '':
username = self._fixedName
proc = username.split('@')
if len(proc) > 1:
domain = proc[1]
else:
domain = ''
username = proc[0]
if self._fixedName is not '':
username = self._fixedName
if self._fixedPassword is not '':
password = self._fixedPassword
if self._fixedDomain is not '':