Merge branch 'master' of https://gitlab.com/UnicodeLabs/OpenRPA.git

Orchestrator/Settings/ControlPanel_RobotScreenActive.py

@@ -4,7 +4,7 @@ import logging
 import os
 #DEFINITIONS
 lProcessName = "OpenRPA_RobotScreenActive.exe"
-lStartFilePath = os.path.join(os.getcwd(), "..\\Utils\\RobotScreenActive\\pyOpenRPA.Tools.RobotScreenActive_x64.cmd")
+lStartFilePath = os.path.join(os.getcwd(), "RobotScreenActive\\pyOpenRPA.Tools.RobotScreenActive_x64.cmd")
 def RenderRobotScreenActive(inGlobalConfiguration):
     #Subheader Variants
     lSubheaderRunTrueText="State: <span style=\"color:green\">Turned on</span>"
@@ -14,6 +14,11 @@ def RenderRobotScreenActive(inGlobalConfiguration):
     import os
     lRobotScreenActivePath = lStartFilePath
     lOnClickRunButton=f"mGlobal.Controller.CMDRunText('start cmd /K  {lRobotScreenActivePath}');"
+    # Activity update orchestrator
+    lActivityOrchestratorBuildPath = os.getcwd()
+    lActivityOrchestratorBuildPathEscaped = lActivityOrchestratorBuildPath.replace("\\","\\\\")
+    lActivityOrchestratorUpdateStr = f"mGlobal.Controller.CMDRunText(\"taskkill /f /im OpenRPA_Orchestrator.exe & timeout 2 & cd {lActivityOrchestratorBuildPathEscaped} & git reset --hard & git pull origin master & pyOpenRPA.Orchestrator_x64_administrator_startup.cmd\");".replace("\"","&quot;")
+    lActivityOrchestratorUpdateHTMLStr=f'<a onclick=\"{lActivityOrchestratorUpdateStr}\" style=\"color:orange\">Обновить orchestrator из GIT и перезапустить</a>'
     #Force close button
     lOnClickForceCloseButton=f"mGlobal.Controller.CMDRunText('taskkill /F /im {lProcessName}');"
     #Result template
@@ -23,6 +28,7 @@ def RenderRobotScreenActive(inGlobalConfiguration):
         "DataStorageKey":"RobotScreenActive", #Use key for set current dict in mGlobal.DataStorage["DtaaStorageKey"] on client side
         "SubheaderText":lSubheaderRunFalseText,
         "BodyKeyValueList":[
+            {"Key":"Репозиторий","Value":lActivityOrchestratorUpdateHTMLStr}
         ],
         "FooterText":"Last update: 9:38:00 09.10.2019",
         "FooterButtonX2List":[
@@ -56,5 +62,5 @@ def CheckIfProcessRunning(processName):
 #Orchestrator settings
 def SettingsUpdate(inDict):
     #Add RobotRDPActive in control panel
-    inDict["ControlPanelDict"]["RobotList"].append({"RenderFunction": RenderRobotScreenActive , "KeyStr": "RobotScreenActive"})
+    inDict["ControlPanelDict"]["RobotList"].append({"RenderFunction": RenderRobotScreenActive,"KeyStr":"RobotScreenActive"}) 
     return inDict

Sources/pyOpenRPA/Orchestrator/Web/Index.xhtml

@@ -254,6 +254,34 @@
 						function(lData,l2,l3)
 						{
 							var lResponseJSON=JSON.parse(lData)
+							///Escape onclick
+							/// RenderRobotList
+							lResponseJSON["RenderRobotList"].forEach(
+								function(lItem){
+									if ('FooterButtonX2List' in lItem) {
+										/// FooterButtonX2List
+										lItem["FooterButtonX2List"].forEach(
+											function(lItem2){
+												if ('OnClick' in lItem) {
+													lOnClickEscaped = lItem["OnClick"];
+													lOnClickEscaped = lOnClickEscaped.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+													lItem["OnClick"] = lOnClickEscaped;
+												}
+											}
+										);
+										/// FooterButtonX1List
+										lItem["FooterButtonX1List"].forEach(
+											function(lItem2){
+												if ('OnClick' in lItem) {
+													lOnClickEscaped = lItem["OnClick"];
+													lOnClickEscaped = lOnClickEscaped.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+													lItem["OnClick"] = lOnClickEscaped;
+												}
+											}
+										);
+									}
+								}
+							);
 							///Сформировать HTML код новой таблицы
 							lHTMLCode=mGlobal.GeneralGenerateHTMLCodeHandlebars(".openrpa-hidden-control-panel",lResponseJSON)
 							//Присвоить ответ в mGlobal.Monitor.mResponseList

Utils/GITBranch_devIvan_master.cmd

@@ -0,0 +1,9 @@
+cd %~dp0
+git push origin devIvan
+git checkout master
+git reset --hard
+git pull
+git merge devIvan
+git push origin master
+git checkout devIvan
+pause >nul

Utils/GITRevisionLastUpdate.cmd

@@ -0,0 +1,4 @@
+cd %~dp0
+git reset --hard
+git pull
+pause >nul