From 050616561b90fe9431acd0f3835aea08b8ad5842 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Wed, 6 May 2020 16:33:19 +0300 Subject: [PATCH] # Add GIT CMD, Add OnClick escape in HTML render control panel --- .../pyOpenRPA/Orchestrator/Web/Index.xhtml | 28 +++++++++++++++++++ Utils/GITBranch_devIvan_master.cmd | 9 ++++++ Utils/GITRevisionLastUpdate.cmd | 4 +++ 3 files changed, 41 insertions(+) create mode 100644 Utils/GITBranch_devIvan_master.cmd create mode 100644 Utils/GITRevisionLastUpdate.cmd diff --git a/Sources/pyOpenRPA/Orchestrator/Web/Index.xhtml b/Sources/pyOpenRPA/Orchestrator/Web/Index.xhtml index 0ae0cfc2..db422ff4 100644 --- a/Sources/pyOpenRPA/Orchestrator/Web/Index.xhtml +++ b/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, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); + lItem["OnClick"] = lOnClickEscaped; + } + } + ); + /// FooterButtonX1List + lItem["FooterButtonX1List"].forEach( + function(lItem2){ + if ('OnClick' in lItem) { + lOnClickEscaped = lItem["OnClick"]; + lOnClickEscaped = lOnClickEscaped.replace(/&/g, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); + lItem["OnClick"] = lOnClickEscaped; + } + } + ); + } + } + ); ///Сформировать HTML код новой таблицы lHTMLCode=mGlobal.GeneralGenerateHTMLCodeHandlebars(".openrpa-hidden-control-panel",lResponseJSON) //Присвоить ответ в mGlobal.Monitor.mResponseList diff --git a/Utils/GITBranch_devIvan_master.cmd b/Utils/GITBranch_devIvan_master.cmd new file mode 100644 index 00000000..500d1ad2 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Utils/GITRevisionLastUpdate.cmd b/Utils/GITRevisionLastUpdate.cmd new file mode 100644 index 00000000..378c325e --- /dev/null +++ b/Utils/GITRevisionLastUpdate.cmd @@ -0,0 +1,4 @@ +cd %~dp0 +git reset --hard +git pull +pause >nul \ No newline at end of file