deploy on previously used pages

ICRAR · Mar 1, 2022 · 8454822 · 8454822
1 parent 89d5a2b
commit 8454822
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/daliuge-translator/dlg/dropmake/web/main.js b/daliuge-translator/dlg/dropmake/web/main.js
@@ -247,8 +247,7 @@ async function restDeploy() {
         .then(handleFetchErrors)
         .then(response => {
             if (response.redirected) {
-                // window.location.href = response.url;
-                window.open(response.url, 'deploy_target', 'popup').focus();
+                window.open(response.url, 'rest_deploy_target');
             }
         })
         .catch(function (error) {

diff --git a/daliuge-translator/dlg/dropmake/web/pg_viewer.html b/daliuge-translator/dlg/dropmake/web/pg_viewer.html
@@ -133,15 +133,15 @@ <h5 class="modal-title" id="settingsModalLabel">Settings</h5>
                     </button>
                 </div>
                 <div class="modal-body">
-                    <form action="/gen_pg" method="get" id="pg_form" target="_blank">
+                    <form action="/gen_pg" method="get" target="blank" name="deploy_target" id="pg_form" >
                         <div class="settingsSection">
                             <span>DALiuGE Manager URL:</span>
                             <input id="managerUrlInput" type="text" name="dlg_mgr_url" value="http://localhost:8001" size="40" style="font-size:16px;">
                         </div>
                         <input type="checkbox" id="dlg_mgr_deploy" style="visibility:hidden;" name="dlg_mgr_deploy" value="deploy" checked>
                         <input type="hidden" name="pgt_id" value="{{pgt_view_json_name}}">
                       </form>
-                    <form action="/gen_pg_helm" method="get" id="pg_helm_form" target="_blank">
+                    <form action="/gen_pg_helm" method="get" id="pg_helm_form" target="_blank" name="deploy_helm_target">
                         <input type="checkbox" id="dlg_helm_deploy" style="visibility:hidden;" name="dlg_helm_deploy" value="helm_deploy" checked>
                         <input type="hidden" name="pgt_id" value="{{pgt_view_json_name}}">
                     </form>