Исправлено условие применения профиля

legacy27 3.6.4.2
parent baa49acac8
commit 8c025dbb31

@ -394,6 +394,15 @@ class VariableClDesktopUpdateProfileSet(Variable):
"""
type = "bool"
def is_fastlogin(self):
urLogin = self.Get('ur_login')
fastlogin = self.Get('cl_desktop_fastlogin_path')
fastlogin_user = path.join(fastlogin, urLogin)
if path.exists(fastlogin_user):
return True
return False
def get(self):
lastTimestamp = templateFunction.getLastElog()
iniEnv = path.join(self.Get('ur_home_path'), '.calculate/ini.env')
@ -403,7 +412,9 @@ class VariableClDesktopUpdateProfileSet(Variable):
userTimestamp = userTimestamp.encode('utf-8')
profileSetup = userIni.getVar('main', 'profile_setup')
login_setup = profileSetup == 'on'
if (self.Get('ur_domain_set') == 'on' or login_setup or
if (self.Get('ur_domain_set') == 'on' or
not self.is_fastlogin() or login_setup or
not path.exists(iniEnv) or userTimestamp != lastTimestamp):
return 'on'
else:

Loading…
Cancel
Save