diff --git a/Sources/pyOpenRPA/Orchestrator/BackwardCompatibility.py b/Sources/pyOpenRPA/Orchestrator/BackwardCompatibility.py index 500a9f77..d73e0c62 100644 --- a/Sources/pyOpenRPA/Orchestrator/BackwardCompatibility.py +++ b/Sources/pyOpenRPA/Orchestrator/BackwardCompatibility.py @@ -368,8 +368,14 @@ def Update(inGSettings): # lUACBool = False # UAC Check is not passed - False for user # # Convert to UACClient dict if "Server" in inGSettings: + # Check if Server is active > convert to ServerDict + inGSettings["ServerDict"] = inGSettings["Server"] + if lL: lL.warning( + f"Backward compatibility (v1.1.20 to v1.2.0): Convert Server to ServerDict") # Log about compatibility + # Remove old structure Scheduler + del inGSettings["Server"] lShowWarnBool = False - lRuleDomainUserDeepCopyDict = copy.deepcopy(inGSettings["Server"]["AccessUsers"]["RuleDomainUserDict"]) + lRuleDomainUserDeepCopyDict = copy.deepcopy(inGSettings["ServerDict"]["AccessUsers"]["RuleDomainUserDict"]) for lItemKeyTurple in lRuleDomainUserDeepCopyDict: lDomainUpperStr = lItemKeyTurple[0] lUserUpperStr = lItemKeyTurple[1] @@ -382,7 +388,7 @@ def Update(inGSettings): # Send update UACDict for user by the list __Orchestrator__.UACUpdate(inGSettings=inGSettings,inADLoginStr=lUserUpperStr, inADStr=lDomainUpperStr, inRoleHierarchyAllowedDict=lUACClientDict) # remove "ControlPanelKeyAllowedList" - del inGSettings["Server"]["AccessUsers"]["RuleDomainUserDict"][lItemKeyTurple]["ControlPanelKeyAllowedList"] + del inGSettings["ServerDict"]["AccessUsers"]["RuleDomainUserDict"][lItemKeyTurple]["ControlPanelKeyAllowedList"] if lShowWarnBool: # Show only 1 warning per all run if lL: lL.warning(f"Backward compatibility (v1.1.20 to v1.2.0): Convert CP allowed list to UAC Client hierarchy (consolidated)") # Log about compatibility # Check if ControlPanelDict is active > convert to CPDict @@ -407,9 +413,4 @@ def Update(inGSettings): # Remove old structure Scheduler del inGSettings["Scheduler"] if lL: lL.warning(f"Backward compatibility (v1.1.20 to v1.2.0): Convert Scheduler to SchedulerDict with new features") # Log about compatibility - # Check if Server is active > convert to ServerDict - if "Server" in inGSettings: - inGSettings["ServerDict"]=inGSettings["Server"] - # Remove old structure Scheduler - del inGSettings["Server"] - if lL: lL.warning(f"Backward compatibility (v1.1.20 to v1.2.0): Convert Server to ServerDict") # Log about compatibility +